gtkmm-2 upgrade. Still some small bugs to iron out, but mostly functional

[lyx.git] / src / frontends / gnome / Makefile.am

diff --git a/src/frontends/gnome/Makefile.am b/src/frontends/gnome/Makefile.am
index 16d5709f978181a454b6dfea78f16bb8ef83793c..5cb06a08094bebb758ed89e36f36dd73235610ac 100644 (file)
--- a/src/frontends/gnome/Makefile.am
+++ b/src/frontends/gnome/Makefile.am
@@ -1,94 +1,122 @@
-AUTOMAKE_OPTIONS = foreign 1.4
-DISTCLEANFILES= *.orig *.rej *~ *.bak core
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+include $(top_srcdir)/config/common.am
+
 noinst_LTLIBRARIES = libgnome.la
-INCLUDES = ${FRONTEND_INCLUDES} -I${top_srcdir}/src/ \
-       -I${top_srcdir}/src/frontends/ -I${top_srcdir}/src/frontends/xforms \
-       ${SIGC_CFLAGS}
-libgnome_la_OBJADD = \
-       ../xforms/FormCitation.lo \
-       ../xforms/form_citation.lo \
-       ../xforms/FormCommand.lo \
-       ../xforms/FormDocument.lo \
-       ../xforms/form_document.lo \
-       ../xforms/FormGraphics.lo \
-       ../xforms/form_graphics.lo \
-       ../xforms/FormIndex.lo \
-       ../xforms/form_index.lo \
-       ../xforms/FormPreferences.lo \
-       ../xforms/form_preferences.lo \
-       ../xforms/FormRef.lo \
-       ../xforms/form_ref.lo \
-       ../xforms/FormTabular.lo \
-       ../xforms/form_tabular.lo \
-       ../xforms/FormToc.lo \
-       ../xforms/form_toc.lo \
-       ../xforms/input_validators.lo \
-       ../xforms/RadioButtonGroup.lo \
-       ../xforms/Toolbar_pimpl.lo
-LIBS= 
-LDFLAGS= $(libgnome_la_OBJADD)
-LYXDATADIRS = 
-#ETAGS_ARGS = --lang=c++
+
+INCLUDES = $(FRONTEND_INCLUDES) -I$(top_srcdir)/src/ \
+       -I$(top_srcdir)/src/frontends/ \
+       -I$(top_srcdir)/src/frontends/xforms \
+       -I$(top_srcdir)/src/frontends/controllers \
+       $(BOOST_INCLUDES)
+
+if USE_BASIC_IMAGE_LOADER
+else
+XFORMSGIMAGE = ../xforms/xformsGImage.lo
+endif
+
+# alphabetised
+xforms_objects = \
+       ../xforms/Alert_pimpl.lo \
+       ../xforms/bmtable.lo \
+       ../xforms/combox.lo \
+       ../xforms/Color.lo \
+       ../xforms/ColorHandler.lo \
+       ../xforms/DropDown.lo \
+       ../xforms/FeedbackController.lo \
+       ../xforms/FileDialog.lo \
+       ../xforms/FontInfo.lo \
+       ../xforms/FormBaseDeprecated.lo \
+       ../xforms/FormFiledialog.lo \
+       ../xforms/form_filedialog.lo \
+       ../xforms/FormMathsBitmap.lo \
+       ../xforms/FormMathsDeco.lo \
+       ../xforms/form_maths_deco.lo \
+       ../xforms/FormMathsDelim.lo \
+       ../xforms/form_maths_delim.lo \
+       ../xforms/FormMathsMatrix.lo \
+       ../xforms/form_maths_matrix.lo \
+       ../xforms/FormMathsPanel.lo \
+       ../xforms/form_maths_panel.lo \
+       ../xforms/FormMathsSpace.lo \
+       ../xforms/form_maths_space.lo \
+       ../xforms/FormMathsStyle.lo \
+       ../xforms/form_maths_style.lo \
+       ../xforms/lyxlookup.lo \
+       ../xforms/MathsSymbols.lo \
+       ../xforms/Menubar_pimpl.lo \
+       ../xforms/Toolbar_pimpl.lo \
+       ../xforms/Tooltips.lo \
+       ../xforms/xfont_loader.lo \
+       ../xforms/xfont_metrics.lo \
+       ../xforms/xforms_helpers.lo \
+       ../xforms/xforms_resize.lo \
+       ../xforms/xformsBC.lo \
+       ../xforms/XFormsView.lo \
+       ../xforms/XPainter.lo \
+       ../xforms/XWorkArea.lo $(XFORMSGIMAGE)
+
+libgnome.la: xforms.lo $(libgnome_la_OBJECTS) $(libgnome_la_DEPENDENCIES)
+
+xforms.lo: $(xforms_objects)
+       $(CXXLINK) $(xforms_objects)
+
+###
+# KOZ 20020315 Large commented out removed.
+###
+
+#LDFLAGS= $(libgnome_la_OBJADD)
+#LYXDATADIRS =
+
 libgnome_la_SOURCES = \
        Dialogs.C \
+       GError.C \
+       GError.h \
+       GERT.C \
+       GERT.h \
+       GPreamble.C \
+       GPreamble.h \
+       GTabularCreate.C \
+       GTabularCreate.h \
+       GUrl.C \
+       GUrl.h \
+       gnome_helpers.C \
+       gnome_helpers.h \
+       GnomeBase.C \
+       GnomeBase.h \
+       gnomeBC.C \
+       gnomeBC.h \
        GUIRunTime.C \
-       FormCitation.C \
-       FormCitation.h \
-       FormCopyright.C \
-       FormCopyright.h \
-       FormPrint.C \
-       FormPrint.h \
-       FormUrl.C \
-       FormUrl.h \
-       FormIndex.C \
-       FormIndex.h \
-       FormToc.C \
-       FormToc.h \
-       Menubar_pimpl.C \
-       Menubar_pimpl.h \
-       mainapp.C \
-       mainapp.h \
-       support.c \
-       support.h \
-       diaprint_callbacks.c \
-       diaprint_callbacks.h \
-       diaprint_interface.c \
-       diaprint_interface.h \
-       diainserturl_callbacks.c  \
-       diainserturl_interface.c  \
-       diainserturl_callbacks.h \
-       diainserturl_interface.h \
-       diainsertindex_callbacks.c  \
-       diainsertindex_interface.c  \
-       diainsertindex_callbacks.h \
-       diainsertindex_interface.h \
-       diatoc_callbacks.c  \
-       diatoc_interface.c  \
-       diatoc_callbacks.h \
-       diatoc_interface.h \
-       diainsertcitation_interface.c \
-       diainsertcitation_interface.h \
-       diainsertcitation_callbacks.c \
-       diainsertcitation_callbacks.h 
+       pixbutton.h \
+       Timeout_pimpl.C \
+       Timeout_pimpl.h
+
+
 
+# Trying to make things a litte more tidy. -- Koz-2002-01-11
+#      mainapp.C \
+#      mainapp.h \
+#      Menubar_pimpl.C \
+#      Menubar_pimpl.h \
+#
+#      FormCopyright.C \
+#      FormCopyright.h \
+#      FormCredits.C \
+#      FormCredits.h \
 # These still have to be added. Sooner or later. ARRae-20000411
 #      GUI_defaults.C \
 #      GUI_initialize.C \
 #      GUI_postlyxrc.C \
-#      GUI_runtime.C \
 #      GUI_applymenu.C
 
 # just copied from old lyx repository
-dist-hook:
-       for subdir in $(LYXDATADIRS) ; do \
-       test -d $(distdir)/$$subdir \
-       || mkdir $(distdir)/$$subdir \
-       || exit 1; \
-       chmod 777 $(distdir)/$$subdir; \
-       list=`(cd $(srcdir)/$$subdir && ls -1 | grep -v CVS)`; \
-       echo $$list ; \
-       for fil in $$list ; do \
-       cp -p $(srcdir)/$$subdir/$$fil $(distdir)/$$subdir ; \
-       done ; \
-       done
+#dist-hook:
+#      for subdir in $(LYXDATADIRS) ; do \
+#      test -d $(distdir)/$$subdir \
+#      || mkdir $(distdir)/$$subdir \
+#      || exit 1; \
+#      chmod 777 $(distdir)/$$subdir; \
+#      list=`(cd $(srcdir)/$$subdir && ls -1 | grep -v CVS)`; \
+#      echo $$list ; \
+#      for fil in $$list ; do \
+#      cp -p $(srcdir)/$$subdir/$$fil $(distdir)/$$subdir ; \
+#      done ; \
+#      done