A lean, clean and working start to the new, improved gnome frontend.

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

diff --git a/src/frontends/gnome/Makefile.am b/src/frontends/gnome/Makefile.am
index 18b4f51af612e5cb42d2a8de2fa8078dc1158e18..c985376f4ecac8a6cf72e51bca25f945c74f6815 100644 (file)
--- a/src/frontends/gnome/Makefile.am
+++ b/src/frontends/gnome/Makefile.am
@@ -1,85 +1,71 @@
-AUTOMAKE_OPTIONS = foreign 1.4
-DISTCLEANFILES= *.orig *.rej *~ *.bak core
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-ETAGS_ARGS = --lang=c++
+include $(top_srcdir)/config/common.am
 
 noinst_LTLIBRARIES = libgnome.la
-BOOST_INCLUDES = -I$(top_srcdir)/boost
-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)
 
-libgnome_la_LIBADD = \
-       ../xforms/xforms_helpers.lo \
-       ../xforms/Toolbar_pimpl.lo \
+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)
+
+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/MathsSymbols.lo \
+       ../xforms/Color.lo \
+       ../xforms/DropDown.lo \
+       ../xforms/FeedbackController.lo \
+       ../xforms/FormBaseDeprecated.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/DropDown.lo \
-       ../xforms/Alert_pimpl.lo \
+       ../xforms/form_maths_space.lo \
+       ../xforms/FormMathsStyle.lo \
+       ../xforms/form_maths_style.lo \
+       ../xforms/MathsSymbols.lo \
        ../xforms/Menubar_pimpl.lo \
-       @LYX_LIBS@ @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
+       ../xforms/Toolbar_pimpl.lo \
+       ../xforms/Tooltips.lo \
+       ../xforms/xforms_helpers.lo \
+       ../xforms/xformsBC.lo \
+       $(XFORMSGIMAGE)
+
+libgnome.la: xforms.lo $(libgnome_la_OBJECTS) $(libgnome_la_DEPENDENCIES)
+
+xforms.lo: $(xforms_objects)
+       $(CXXLINK) $(xforms_objects)
 
-#      ../xforms/FileDialog.lo \
-#      ../xforms/FormFiledialog.lo \
-#      ../xforms/form_filedialog.lo 
-#      ../xforms/Timeout_pimpl.lo \
-#      ../xforms/Color.lo \
-#      ../xforms/FormFiledialog.lo \
-#      ../xforms/form_filedialog.lo \
-#      ../xforms/FormBase.lo \
-#      ../xforms/FormCitation.lo \
-#      ../xforms/form_citation.lo \
-#      ../xforms/FormCopyright.lo \
-#      ../xforms/form_copyright.lo \
-#      ../xforms/FormDocument.lo \
-#      ../xforms/form_document.lo \
-#      ../xforms/FormError.lo \
-#      ../xforms/form_error.lo \
-#      ../xforms/FormGraphics.lo \
-#      ../xforms/form_graphics.lo \
-#      ../xforms/FormIndex.lo \
-#      ../xforms/form_index.lo \
-#      ../xforms/FormInset.lo \
-#      ../xforms/FormParagraph.lo \
-#      ../xforms/form_paragraph.lo \
-#      ../xforms/FormPreferences.lo \
-#      ../xforms/form_preferences.lo \
-#      ../xforms/FormPrint.lo \
-#      ../xforms/form_print.lo \
-#      ../xforms/FormRef.lo \
-#      ../xforms/form_ref.lo \
-#      ../xforms/FormTabular.lo \
-#      ../xforms/form_tabular.lo \
-#      ../xforms/FormTabularCreate.lo \
-#      ../xforms/form_tabular_create.lo \
-#      ../xforms/FormToc.lo \
-#      ../xforms/form_toc.lo \
-#      ../xforms/input_validators.lo \
-#      ../xforms/RadioButtonGroup.lo \
+###
+# KOZ 20020315 Large commented out removed.
+###
 
-LIBS= 
 #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 \
+       GTabularCreate.C \
+       GTabularCreate.h \
+       GUrl.C \
+       GUrl.h \
+       GERT.C \
+       GERT.h \
        gnome_helpers.C \
        gnome_helpers.h \
        GnomeBase.C \