some more compile fixing

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3631 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/gnome/Makefile.am b/src/frontends/gnome/Makefile.am
index 18b4f51af612e5cb42d2a8de2fa8078dc1158e18..d729342785f8eeac5f91ea1f058a6304d5d0e9bd 100644 (file)
--- a/src/frontends/gnome/Makefile.am
+++ b/src/frontends/gnome/Makefile.am
@@ -12,6 +12,9 @@ INCLUDES = ${FRONTEND_INCLUDES} -I${top_srcdir}/src/ \
        ${SIGC_CFLAGS} $(BOOST_INCLUDES)
 
 libgnome_la_LIBADD = \
+       @LYX_LIBS@ @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
+
+xforms_objects = \
        ../xforms/xforms_helpers.lo \
        ../xforms/Toolbar_pimpl.lo \
        ../xforms/combox.lo \
@@ -24,8 +27,12 @@ libgnome_la_LIBADD = \
        ../xforms/FormMathsSpace.lo \
        ../xforms/DropDown.lo \
        ../xforms/Alert_pimpl.lo \
-       ../xforms/Menubar_pimpl.lo \
-       @LYX_LIBS@ @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
+       ../xforms/Menubar_pimpl.lo
+
+libgnome.la: xforms.lo $(libgnome_la_OBJECTS) $(libgnome_la_DEPENDENCIES)
+
+xforms.lo: $(xforms_objects)
+       $(CXXLINK) $(xforms_objects)
 
 #      ../xforms/FileDialog.lo \
 #      ../xforms/FormFiledialog.lo \

diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt2/Makefile.am
index 87414f5cbb1043673d28f800391f0882f87322e8..77d39d2705dd4bdb2d2760e71f0d8eeb79238afc 100644 (file)
--- a/src/frontends/qt2/Makefile.am
+++ b/src/frontends/qt2/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-noinst_LTLIBRARIES = libqt2.o
+noinst_LTLIBRARIES = libqt2.la
 BOOST_INCLUDES = -I$(top_srcdir)/boost
 SUBDIRS=ui moc
 INCLUDES = -I${top_srcdir}/src/ -I${top_srcdir}/src/frontends/ \
@@ -10,12 +10,37 @@ AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
 
 DISTCLEANFILES = $(BUILTSOURCES) *.orig *.rej *~ *.bak core
 
+LIBS=
+ETAGS_ARGS = --lang=c++
+
 include Makefile.dialogs
 
-libqt2_o_LIBADD = \
+libqt2_la_LIBADD = \
        ui/libqt2ui.o \
        moc/libqt2moc.o \
        ui/moc/libqt2uimoc.o \
+       @LYX_LIBS@ @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
+
+libqt2_la_SOURCES = \
+       $(DIALOGSOURCES) \
+       Dialogs.C \
+       GUIRunTime.C \
+       FileDialog.C \
+       FileDialog_private.C \
+       Timeout_pimpl.h \
+       Timeout_pimpl.C \
+       Qt2Base.C       \
+       Qt2Base.h       \
+       Qt2BC.C \
+       Qt2BC.h \
+       emptytable.C \
+       emptytable.h \
+       lengthcombo.C \
+       lengthcombo.h \
+       qttableview.h \
+       qttableview.C
+
+xforms_objects = \
        ../xforms/combox.o \
        ../xforms/Alert_pimpl.o \
        ../xforms/Color.o \
@@ -47,28 +72,9 @@ libqt2_o_LIBADD = \
        ../xforms/form_maths_style.o \
        ../xforms/input_validators.o \
        ../xforms/xformsBC.o \
-       ../xforms/xforms_helpers.o \
-       @LYX_LIBS@ @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
- 
-LIBS=
-#LDFLAGS= $(libqt2_la_OBJADD)
-ETAGS_ARGS = --lang=c++
+       ../xforms/xforms_helpers.o
 
-libqt2_o_SOURCES = \
-       $(DIALOGSOURCES) \
-       Dialogs.C \
-       GUIRunTime.C \
-       FileDialog.C \
-       FileDialog_private.C \
-       Timeout_pimpl.h \
-       Timeout_pimpl.C \
-       Qt2Base.C       \
-       Qt2Base.h       \
-       Qt2BC.C \
-       Qt2BC.h \
-       emptytable.C \
-       emptytable.h \
-       lengthcombo.C \
-       lengthcombo.h \
-       qttableview.h \
-       qttableview.C
+libqt2.la: xforms.lo $(libqt2_la_OBJECTS) $(libqt2_la_DEPENDENCIES)
+
+xforms.lo: $(xforms_objects)
+       $(CXXLINK) $(xforms_objects)
\ No newline at end of file

diff --git a/src/frontends/qt2/moc/Makefile.am b/src/frontends/qt2/moc/Makefile.am
index c3886fb01ebc18d71c7629b55ecac6fe81fbcb3e..2b86c77f26de310dabcb793e95a120961b762a29 100644 (file)
--- a/src/frontends/qt2/moc/Makefile.am
+++ b/src/frontends/qt2/moc/Makefile.am
@@ -1,6 +1,10 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-noinst_LTLIBRARIES = libqt2moc.o
+DISTCLEANFILES = $(libqt2moc_la_SOURCES) *.orig *.rej *~ *.bak core
+ETAGS_ARGS = --lang=c++
+
+noinst_LTLIBRARIES = libqt2moc.la
+
 BOOST_INCLUDES = -I$(top_srcdir)/boost
 INCLUDES = -I${top_srcdir}/src/ \
        -I${top_srcdir}/src/frontends/ \
@@ -13,16 +17,14 @@ AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
 
 include ../Makefile.dialogs
 
-libqt2moc_o_SOURCES := FileDialog_private_moc.C \
+libqt2moc_la_SOURCES := FileDialog_private_moc.C \
        emptytable_moc.C \
        lengthcombo_moc.C \
        qttableview_moc.C \
        Qt2Base_moc.C \
        $(MOCDIALOGS)
 
-DISTCLEANFILES = $(libqt2moc_la_SOURCES) *.orig *.rej *~ *.bak core
-
-ETAGS_ARGS = --lang=c++
+libqt2moc.la: $(libqt2moc_la_OBJECTS) $(libqt2moc_la_DEPENDENCIES)
 
 %_moc.C: ../%.h
        $(MOC) -o $@ $<

diff --git a/src/frontends/qt2/ui/Makefile.am b/src/frontends/qt2/ui/Makefile.am
index 3092ca7a0efc241dd7a7999dc1f0f02528d1f0ac..d3f96348faeb2ce23c4dca2a4a3e49eb4425ba71 100644 (file)
--- a/src/frontends/qt2/ui/Makefile.am
+++ b/src/frontends/qt2/ui/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-noinst_LTLIBRARIES = libqt2ui.o
+noinst_LTLIBRARIES = libqt2ui.la
 BOOST_INCLUDES = -I$(top_srcdir)/boost
 INCLUDES = -I${top_srcdir}/src/ -I${top_srcdir}/src/frontends/ -I$(top_srcdir)/src/frontends/qt2/ \
        ${SIGC_CFLAGS} ${FRONTEND_INCLUDES} $(BOOST_INCLUDES) \
@@ -13,7 +13,9 @@ include ../Makefile.dialogs
 
 DISTCLEANFILES = $(UIDIALOGS) *.orig *.rej *~ *.bak core
 
-libqt2ui_o_SOURCES = $(UIDIALOGS)
+libqt2ui_la_SOURCES = $(UIDIALOGS)
+
+libqt2ui.la: $(libqt2ui_la_OBJECTS) $(libqt2ui_la_DEPENDENCIES)
 
 # a pattern to change tr() to _()
 

diff --git a/src/frontends/qt2/ui/moc/Makefile.am b/src/frontends/qt2/ui/moc/Makefile.am
index 924c137552d33997dc7c816e9e2bc3f3510105ae..27a5e167858fadb7ea5c12d1daee677bdab0a3cb 100644 (file)
--- a/src/frontends/qt2/ui/moc/Makefile.am
+++ b/src/frontends/qt2/ui/moc/Makefile.am
@@ -1,6 +1,10 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-noinst_LTLIBRARIES = libqt2uimoc.o
+DISTCLEANFILES = $(libqt2uimoc_la_SOURCES) *.orig *.rej *~ *.bak core
+ETAGS_ARGS = --lang=c++
+
+noinst_LTLIBRARIES = libqt2uimoc.la
+
 BOOST_INCLUDES = -I$(top_srcdir)/boost
 INCLUDES = -I${top_srcdir}/src/ \
        -I${top_srcdir}/src/frontends/ \
@@ -12,11 +16,9 @@ AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
 
 include ../../Makefile.dialogs
 
-libqt2uimoc_o_SOURCES := $(UIMOCDIALOGS)
- 
-DISTCLEANFILES = $(libqt2uimoc_la_SOURCES) *.orig *.rej *~ *.bak core
+libqt2uimoc_la_SOURCES := $(UIMOCDIALOGS)
 
-ETAGS_ARGS = --lang=c++
+libqt2uimoc.la: $(libqt2uimoc_la_OBJECTS) $(libqt2uimoc_la_DEPENDENCIES)
 
 %_moc.C: ../%.h
        $(MOC) -o $@ $<