anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

unification of all Makefiles.am

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3748 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2002-03-13 18:24:44 +00:00
parent 8407bdc22f
commit 69013332e2
17 changed files with 85 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile.am
View File

@ -1,19 +1,20 @@
AUTOMAKE_OPTIONS = foreign include $(top_srcdir)/config/common.am
DISTCLEANFILES = -r *.orig *.rej *~ *.bak lyx.1 core \
config.status config.cache config.log \ DISTCLEANFILES += lyx.1 config.status config.cache config.log \
$(srcdir)/sourcedoc/*~ \ $(srcdir)/sourcedoc/*~ \
$(srcdir)/sourcedoc/html $(srcdir)/sourcedoc/latex \ $(srcdir)/sourcedoc/html $(srcdir)/sourcedoc/latex \
$(srcdir)/sourcedoc/man $(srcdir)/sourcedoc/Doxyfile $(srcdir)/sourcedoc/man $(srcdir)/sourcedoc/Doxyfile
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/aclocal.m4 \
MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
$(srcdir)/configure $(srcdir)/development/lyx.spec \ $(srcdir)/configure $(srcdir)/development/lyx.spec \
$(srcdir)/acinclude.m4 $(srcdir)/sourcedoc/Doxyfile $(srcdir)/acinclude.m4 $(srcdir)/sourcedoc/Doxyfile
SUBDIRS = intl po sigc++ boost src lib SUBDIRS = intl po sigc++ boost src lib
EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \ EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \
UPGRADING lyx.man acconfig.h autogen.sh \ UPGRADING lyx.man acconfig.h autogen.sh \
config development images sourcedoc config development images sourcedoc
#ETAGS_ARGS = --language-force=c++
man_MANS = lyx.1 man_MANS = lyx.1
## Needed by bindist ## Needed by bindist
@ -58,10 +59,6 @@ doxydoc: sourcedoc/Doxyfile
cd sourcedoc; \ cd sourcedoc; \
doxygen ./Doxyfile doxygen ./Doxyfile
#sourcedoc/Doxyfile: sourcedoc/Doxyfile.in config.status
# cd $(top_builddir) \
# && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
lgbtags: lgbtags:
etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/* etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*

10
config/common.am Normal file
View File

@ -0,0 +1,10 @@
AUTOMAKE_OPTIONS = foreign
DISTCLEANFILES= -r *.orig *.rej *~ *.bak core
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
ETAGS_ARGS = --lang=c++
BOOST_INCLUDES = -I$(top_srcdir)/boost
SIGC_INCLUDES = -I$(top_srcdir) -I$(top_builddir)

1
po/POTFILES.in
View File

@ -9,6 +9,7 @@ src/converter.C
src/CutAndPaste.C src/CutAndPaste.C
src/debug.C src/debug.C
src/exporter.C src/exporter.C
src/ext_l10n.h
src/FontLoader.C src/FontLoader.C
src/frontends/controllers/biblio.C src/frontends/controllers/biblio.C
src/frontends/controllers/ButtonController.h src/frontends/controllers/ButtonController.h

13
src/Makefile.am
View File

@ -1,7 +1,11 @@
AUTOMAKE_OPTIONS = foreign include $(top_srcdir)/config/common.am
DISTCLEANFILES += config.h libintl.h
MAINTAINERCLEANFILES += $(srcdir)/config.h.in
SUBDIRS = mathed insets graphics support frontends SUBDIRS = mathed insets graphics support frontends
DISTCLEANFILES= *.orig *.rej *~ *.bak core libintl.h config.h
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/config.h.in
bin_PROGRAMS = lyx bin_PROGRAMS = lyx
lyx_DEPENDENCIES = mathed/libmathed.o insets/libinsets.o \ lyx_DEPENDENCIES = mathed/libmathed.o insets/libinsets.o \
@ -23,8 +27,6 @@ EXTRA_DIST = config.h.in stamp-h.in cheaders ext_l10n.h version.C.in \
counters.C \ counters.C \
counters.h counters.h
ETAGS_ARGS = --lang=c++
BOOST_INCLUDES = -I$(top_srcdir)/boost
INCLUDES = $(SIGC_CFLAGS) $(BOOST_INCLUDES) $(PSPELL_INCLUDES) INCLUDES = $(SIGC_CFLAGS) $(BOOST_INCLUDES) $(PSPELL_INCLUDES)
localedir = $(datadir)/locale localedir = $(datadir)/locale
BUILT_SOURCES = version.C BUILT_SOURCES = version.C
@ -66,7 +68,6 @@ lyx_SOURCES = \
LyXAction.h \ LyXAction.h \
LyXView.C \ LyXView.C \
LyXView.h \ LyXView.h \
Makefile.in \
MenuBackend.C \ MenuBackend.C \
MenuBackend.h \ MenuBackend.h \
Painter.C \ Painter.C \

15
src/frontends/Makefile.am
View File

@ -1,16 +1,11 @@
AUTOMAKE_OPTIONS = foreign 1.4 include $(top_srcdir)/config/common.am
DISTCLEANFILES= *.orig *.rej *~ *.bak core
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
# xforms has to be fixed here as we still need object files in this directory
# for the compilation of other frontends, so until that we have to let this
# here.
SUBDIRS = controllers @FRONTEND@ SUBDIRS = controllers @FRONTEND@
ETAGS_ARGS = --lang=c++
BOOST_INCLUDES = -I$(top_srcdir)/boost
INCLUDES = $(FRONTEND_INCLUDES) -I$(srcdir)/.. $(SIGC_CFLAGS) $(BOOST_INCLUDES)
LIBS =
noinst_LTLIBRARIES = libfrontends.la noinst_LTLIBRARIES = libfrontends.la
INCLUDES = $(FRONTEND_INCLUDES) -I$(srcdir)/.. $(SIGC_CFLAGS) $(BOOST_INCLUDES)
libfrontends_la_LIBADD= @FRONTEND_GUILIB@ \ libfrontends_la_LIBADD= @FRONTEND_GUILIB@ \
controllers/*.lo controllers/*.lo

9
src/frontends/controllers/Makefile.am
View File

@ -1,13 +1,10 @@
AUTOMAKE_OPTIONS = foreign 1.4 include $(top_srcdir)/config/common.am
DISTCLEANFILES= *.orig *.rej *~ *.bak core
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
noinst_LTLIBRARIES = libcontrollers.la noinst_LTLIBRARIES = libcontrollers.la
BOOST_INCLUDES = -I$(top_srcdir)/boost
INCLUDES = -I${top_srcdir}/src/ \ INCLUDES = -I${top_srcdir}/src/ \
-I${top_srcdir}/src/frontends/ \ -I${top_srcdir}/src/frontends/ \
${SIGC_CFLAGS} $(BOOST_INCLUDES) ${SIGC_CFLAGS} $(BOOST_INCLUDES)
LIBS =
ETAGS_ARGS = --lang=c++
EXTRA_DIST = ButtonController.tmpl ControlDialog.tmpl ControlInset.tmpl EXTRA_DIST = ButtonController.tmpl ControlDialog.tmpl ControlInset.tmpl

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

@ -1,10 +1,6 @@
AUTOMAKE_OPTIONS = foreign 1.4 include $(top_srcdir)/config/common.am
DISTCLEANFILES= *.orig *.rej *~ *.bak core
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
ETAGS_ARGS = --lang=c++
noinst_LTLIBRARIES = libgnome.la noinst_LTLIBRARIES = libgnome.la
BOOST_INCLUDES = -I$(top_srcdir)/boost
INCLUDES = ${FRONTEND_INCLUDES} -I${top_srcdir}/src/ \ INCLUDES = ${FRONTEND_INCLUDES} -I${top_srcdir}/src/ \
-I${top_srcdir}/src/frontends/ \ -I${top_srcdir}/src/frontends/ \
@ -12,9 +8,6 @@ INCLUDES = ${FRONTEND_INCLUDES} -I${top_srcdir}/src/ \
-I${top_srcdir}/src/frontends/controllers \ -I${top_srcdir}/src/frontends/controllers \
${SIGC_CFLAGS} $(BOOST_INCLUDES) ${SIGC_CFLAGS} $(BOOST_INCLUDES)
#libgnome_la_LIBADD = \
# @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
if USE_BASIC_IMAGE_LOADER if USE_BASIC_IMAGE_LOADER
else else
XFORMSGIMAGE = ../xforms/xformsGImage.lo XFORMSGIMAGE = ../xforms/xformsGImage.lo
@ -78,7 +71,6 @@ xforms.lo: $(xforms_objects)
# ../xforms/input_validators.lo \ # ../xforms/input_validators.lo \
# ../xforms/RadioButtonGroup.lo \ # ../xforms/RadioButtonGroup.lo \
LIBS=
#LDFLAGS= $(libgnome_la_OBJADD) #LDFLAGS= $(libgnome_la_OBJADD)
LYXDATADIRS = LYXDATADIRS =

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

@ -1,20 +1,18 @@
AUTOMAKE_OPTIONS = foreign 1.4 include $(top_srcdir)/config/common.am
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
DISTCLEANFILES = $(BUILTSOURCES) *.orig *.rej *~ *.bak core DISTCLEANFILES += $(BUILTSOURCES)
ETAGS_ARGS = --lang=c++
SUBDIRS = xforms ui moc
noinst_LTLIBRARIES = libqt2.la noinst_LTLIBRARIES = libqt2.la
BOOST_INCLUDES = -I$(top_srcdir)/boost INCLUDES = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \
SUBDIRS=xforms ui moc $(SIGC_CFLAGS) -I$(top_srcdir)/images \
INCLUDES = -I${top_srcdir}/src/ -I${top_srcdir}/src/frontends/ \ $(FRONTEND_INCLUDES) $(BOOST_INCLUDES) \
${SIGC_CFLAGS} -I$(top_srcdir)/images ${FRONTEND_INCLUDES} $(BOOST_INCLUDES) \
-I$(top_srcdir)/src/frontends/controllers -I$(top_srcdir)/src/frontends/controllers
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
LIBS=
include Makefile.dialogs include Makefile.dialogs
#libqt2_la_LIBADD = \ #libqt2_la_LIBADD = \

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

@ -1,11 +1,9 @@
AUTOMAKE_OPTIONS = foreign 1.4 include $(top_srcdir)/config/common.am
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
DISTCLEANFILES = $(libqt2moc_la_SOURCES) *.orig *.rej *~ *.bak core DISTCLEANFILES += $(libqt2moc_la_SOURCES)
ETAGS_ARGS = --lang=c++
noinst_LTLIBRARIES = libqt2moc.la noinst_LTLIBRARIES = libqt2moc.la
BOOST_INCLUDES = -I$(top_srcdir)/boost
INCLUDES = -I${top_srcdir}/src/ \ INCLUDES = -I${top_srcdir}/src/ \
-I${top_srcdir}/src/frontends/ \ -I${top_srcdir}/src/frontends/ \
-I${top_srcdir}/src/frontends/controllers \ -I${top_srcdir}/src/frontends/controllers \
@ -13,11 +11,12 @@ INCLUDES = -I${top_srcdir}/src/ \
${SIGC_CFLAGS} \ ${SIGC_CFLAGS} \
${FRONTEND_INCLUDES} \ ${FRONTEND_INCLUDES} \
$(BOOST_INCLUDES) $(BOOST_INCLUDES)
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
include ../Makefile.dialogs include ../Makefile.dialogs
libqt2moc_la_SOURCES := FileDialog_private_moc.C \ libqt2moc_la_SOURCES = FileDialog_private_moc.C \
emptytable_moc.C \ emptytable_moc.C \
lengthcombo_moc.C \ lengthcombo_moc.C \
qttableview_moc.C \ qttableview_moc.C \

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

@ -1,17 +1,20 @@
AUTOMAKE_OPTIONS = foreign 1.4 include $(top_srcdir)/config/common.am
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
noinst_LTLIBRARIES = libqt2ui.la 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/ \ INCLUDES = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \
${SIGC_CFLAGS} ${FRONTEND_INCLUDES} $(BOOST_INCLUDES) \ -I$(top_srcdir)/src/frontends/qt2/ \
$(SIGC_CFLAGS) $(FRONTEND_INCLUDES) $(BOOST_INCLUDES) \
-I$(top_srcdir)/src/frontends/controllers -I$(top_srcdir)/src/frontends/controllers
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
ETAGS_ARGS = --lang=c++
SUBDIRS=. moc
SUBDIRS =. moc
include ../Makefile.dialogs include ../Makefile.dialogs
DISTCLEANFILES = $(UIDIALOGS) *.orig *.rej *~ *.bak core DISTCLEANFILES += $(UIDIALOGS)
libqt2ui_la_SOURCES = $(UIDIALOGS) libqt2ui_la_SOURCES = $(UIDIALOGS)
@ -19,9 +22,9 @@ libqt2ui.la: $(libqt2ui_la_OBJECTS) $(libqt2ui_la_DEPENDENCIES)
# a pattern to change tr() to _() # a pattern to change tr() to _()
SED=sed SED = sed
SEDREPLACETR=s,[^A-Za-z]tr[ ]*(,_(,g SEDREPLACETR = s,[^A-Za-z]tr[ ]*(,_(,g
SEDREMOVEEMPTY=s,_[ ]*([ ]*""[ ]*),"",g SEDREMOVEEMPTY = s,_[ ]*([ ]*""[ ]*),"",g
QAskForTextDialog.h: QAskForTextDialog.ui QAskForTextDialog.h: QAskForTextDialog.ui
$(UIC) $< -o $@ $(UIC) $< -o $@

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

@ -1,17 +1,16 @@
AUTOMAKE_OPTIONS = foreign 1.4 include $(top_srcdir)/config/common.am
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
DISTCLEANFILES = $(libqt2uimoc_la_SOURCES) *.orig *.rej *~ *.bak core DISTCLEANFILES += $(libqt2uimoc_la_SOURCES)
ETAGS_ARGS = --lang=c++
noinst_LTLIBRARIES = libqt2uimoc.la noinst_LTLIBRARIES = libqt2uimoc.la
BOOST_INCLUDES = -I$(top_srcdir)/boost
INCLUDES = -I${top_srcdir}/src/ \ INCLUDES = -I${top_srcdir}/src/ \
-I${top_srcdir}/src/frontends/ \ -I${top_srcdir}/src/frontends/ \
-I${top_srcdir}/src/frontends/controllers \ -I${top_srcdir}/src/frontends/controllers \
${SIGC_CFLAGS} \ ${SIGC_CFLAGS} \
${FRONTEND_INCLUDES} \ ${FRONTEND_INCLUDES} \
$(BOOST_INCLUDES) $(BOOST_INCLUDES)
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
include ../../Makefile.dialogs include ../../Makefile.dialogs

11
src/frontends/qt2/xforms/Makefile.am
View File

@ -1,17 +1,12 @@
AUTOMAKE_OPTIONS = foreign 1.4 include $(top_srcdir)/config/common.am
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
DISTCLEANFILES = $(XFORMS_SOURCES) $(BUILTSOURCES) *.orig *.rej *~ *.bak core
noinst_LTLIBRARIES = libqt2xforms.la noinst_LTLIBRARIES = libqt2xforms.la
BOOST_INCLUDES = -I$(top_srcdir)/boost
INCLUDES = -I${top_srcdir}/src/ -I${top_srcdir}/src/frontends/ \ INCLUDES = -I${top_srcdir}/src/ -I${top_srcdir}/src/frontends/ \
${SIGC_CFLAGS} -I$(top_srcdir)/images ${FRONTEND_INCLUDES} $(BOOST_INCLUDES) \ ${SIGC_CFLAGS} -I$(top_srcdir)/images \
${FRONTEND_INCLUDES} $(BOOST_INCLUDES) \
-I$(top_srcdir)/src/frontends/controllers -I$(top_srcdir)/src/frontends/controllers
LIBS=
ETAGS_ARGS = --lang=c++
EXTRA_DIST = xformsGImage.C xformsGImage.h EXTRA_DIST = xformsGImage.C xformsGImage.h
if USE_BASIC_IMAGE_LOADER if USE_BASIC_IMAGE_LOADER

10
src/frontends/xforms/Makefile.am
View File

@ -1,15 +1,13 @@
AUTOMAKE_OPTIONS = foreign 1.4 include $(top_srcdir)/config/common.am
DISTCLEANFILES= *.orig *.rej *~ *.bak core
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
noinst_LTLIBRARIES = libxforms.la noinst_LTLIBRARIES = libxforms.la
BOOST_INCLUDES = -I$(top_srcdir)/boost
INCLUDES = -I${top_srcdir}/images -I${top_srcdir}/src/ \ INCLUDES = -I${top_srcdir}/images -I${top_srcdir}/src/ \
-I${top_srcdir}/src/frontends/ \ -I${top_srcdir}/src/frontends/ \
-I${top_srcdir}/src/frontends/controllers \ -I${top_srcdir}/src/frontends/controllers \
${SIGC_CFLAGS} $(BOOST_INCLUDES) ${SIGC_CFLAGS} $(BOOST_INCLUDES)
LIBS=
LYXDATADIRS = forms LYXDATADIRS = forms
ETAGS_ARGS = --lang=c++
EXTRA_DIST = xformsGImage.C xformsGImage.h EXTRA_DIST = xformsGImage.C xformsGImage.h

9
src/graphics/Makefile.am
View File

@ -1,10 +1,7 @@
AUTOMAKE_OPTIONS = foreign include $(top_srcdir)/config/common.am
DISTCLEANFILES= *.orig *.rej *~ *.bak core
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
noinst_LTLIBRARIES = libgraphics.la noinst_LTLIBRARIES = libgraphics.la
LIBS =
ETAGS_ARGS = --lang=c++
BOOST_INCLUDES = -I$(top_srcdir)/boost
INCLUDES = -I${srcdir}/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES) INCLUDES = -I${srcdir}/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
EXTRA_DIST = GraphicsImageXPM.C GraphicsImageXPM.h EXTRA_DIST = GraphicsImageXPM.C GraphicsImageXPM.h

9
src/insets/Makefile.am
View File

@ -1,10 +1,7 @@
AUTOMAKE_OPTIONS = foreign include $(top_srcdir)/config/common.am
DISTCLEANFILES= *.orig *.rej *~ *.bak core
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
noinst_LTLIBRARIES = libinsets.la noinst_LTLIBRARIES = libinsets.la
LIBS =
ETAGS_ARGS = --lang=c++
BOOST_INCLUDES = -I$(top_srcdir)/boost
INCLUDES = -I${srcdir}/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES) INCLUDES = -I${srcdir}/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
EXTRA_DIST = \ EXTRA_DIST = \

9
src/mathed/Makefile.am
View File

@ -1,10 +1,7 @@
AUTOMAKE_OPTIONS = foreign 1.4 include $(top_srcdir)/config/common.am
DISTCLEANFILES= *.orig *.rej *~ *.bak core
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
noinst_LTLIBRARIES = libmathed.la noinst_LTLIBRARIES = libmathed.la
LIBS=
ETAGS_ARGS = --lang=c++
BOOST_INCLUDES = -I$(top_srcdir)/boost
INCLUDES = -I${srcdir}/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES) INCLUDES = -I${srcdir}/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
libmathed_la_SOURCES = \ libmathed_la_SOURCES = \

10
src/support/Makefile.am
View File

@ -1,11 +1,7 @@
AUTOMAKE_OPTIONS = foreign include $(top_srcdir)/config/common.am
DISTCLEANFILES= *.orig *.rej *~ *.bak core
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
noinst_LTLIBRARIES = libsupport.la noinst_LTLIBRARIES = libsupport.la
LIBS =
ETAGS_ARGS = --lang=c++
BOOST_INCLUDES = -I$(top_srcdir)/boost
SIGC_INCLUDES = -I$(top_srcdir) -I$(top_builddir)
INCLUDES = -I${srcdir}/../ $(SIGC_INCLUDES) $(BOOST_INCLUDES) INCLUDES = -I${srcdir}/../ $(SIGC_INCLUDES) $(BOOST_INCLUDES)
EXTRA_DIST = lyxstring.C lyxstring.h regex.c lyxregex.h \ EXTRA_DIST = lyxstring.C lyxstring.h regex.c lyxregex.h \