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 6c7a11a75102e9f25244d023a5cd1405236ed506..5cb06a08094bebb758ed89e36f36dd73235610ac 100644 (file)
--- a/src/frontends/gnome/Makefile.am
+++ b/src/frontends/gnome/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = $(FRONTEND_INCLUDES) -I$(top_srcdir)/src/ \
        -I$(top_srcdir)/src/frontends/ \
        -I$(top_srcdir)/src/frontends/xforms \
        -I$(top_srcdir)/src/frontends/controllers \
-       $(SIGC_CFLAGS) $(BOOST_INCLUDES)
+       $(BOOST_INCLUDES)
 
 if USE_BASIC_IMAGE_LOADER
 else
@@ -19,9 +19,14 @@ xforms_objects = \
        ../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 \
@@ -35,13 +40,19 @@ xforms_objects = \
        ../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 \
-       $(XFORMSGIMAGE)
+       ../xforms/XFormsView.lo \
+       ../xforms/XPainter.lo \
+       ../xforms/XWorkArea.lo $(XFORMSGIMAGE)
 
 libgnome.la: xforms.lo $(libgnome_la_OBJECTS) $(libgnome_la_DEPENDENCIES)
 
@@ -53,19 +64,20 @@ xforms.lo: $(xforms_objects)
 ###
 
 #LDFLAGS= $(libgnome_la_OBJADD)
-LYXDATADIRS =
+#LYXDATADIRS =
 
 libgnome_la_SOURCES = \
        Dialogs.C \
-       FileDialog.C \
-       FormError.C \
-       FormError.h \
-       FormTabularCreate.C \
-       FormTabularCreate.h \
-       FormUrl.C \
-       FormUrl.h \
-       FormERT.C \
-       FormERT.h \
+       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 \
@@ -74,11 +86,11 @@ libgnome_la_SOURCES = \
        gnomeBC.h \
        GUIRunTime.C \
        pixbutton.h \
-       support.c \
-       support.h \
        Timeout_pimpl.C \
        Timeout_pimpl.h
 
+
+
 # Trying to make things a litte more tidy. -- Koz-2002-01-11
 #      mainapp.C \
 #      mainapp.h \
@@ -96,15 +108,15 @@ libgnome_la_SOURCES = \
 #      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