anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

some more compile fixing

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3631 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2002-03-01 17:30:53 +00:00
parent 5f1a3be830
commit d226ca60fa
5 changed files with 59 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/frontends/gnome/Makefile.am
View File

@ -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 \

56
src/frontends/qt2/Makefile.am
View File

@ -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@
../xforms/xforms_helpers.o
LIBS=
#LDFLAGS= $(libqt2_la_OBJADD)
ETAGS_ARGS = --lang=c++
libqt2.la: xforms.lo $(libqt2_la_OBJECTS) $(libqt2_la_DEPENDENCIES)
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
xforms.lo: $(xforms_objects)
$(CXXLINK) $(xforms_objects)

12
src/frontends/qt2/moc/Makefile.am
View File

@ -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 $@ $<

6
src/frontends/qt2/ui/Makefile.am
View File

@ -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 _()

12
src/frontends/qt2/ui/moc/Makefile.am
View File

@ -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)
libqt2uimoc_la_SOURCES := $(UIMOCDIALOGS)
DISTCLEANFILES = $(libqt2uimoc_la_SOURCES) *.orig *.rej *~ *.bak core
ETAGS_ARGS = --lang=c++
libqt2uimoc.la: $(libqt2uimoc_la_OBJECTS) $(libqt2uimoc_la_DEPENDENCIES)
%_moc.C: ../%.h
$(MOC) -o $@ $<