unification of all Makefiles.am

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

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

diff --git a/config/common.am b/config/common.am
new file mode 100644 (file)
index 0000000..b684ef1
--- /dev/null
+++ b/config/common.am
@@ -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)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2e6bb2cc2a923879fcc5e1e0d921f4a76fedbb63..fd8f31dca7d1d095c885d7c83ab4131a876f01a5 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -9,6 +9,7 @@ src/converter.C
 src/CutAndPaste.C
 src/debug.C
 src/exporter.C
+src/ext_l10n.h
 src/FontLoader.C
 src/frontends/controllers/biblio.C
 src/frontends/controllers/ButtonController.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 34ead44ed81356cc47b820614ab16cab6a22de9e..b557f1e1c8d6551bded71415c0349f1219f897aa 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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
-DISTCLEANFILES= *.orig *.rej *~ *.bak core libintl.h config.h
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/config.h.in
+
 bin_PROGRAMS = lyx
 
 lyx_DEPENDENCIES = mathed/libmathed.o insets/libinsets.o \
@@ -22,9 +26,7 @@ EXTRA_DIST = config.h.in stamp-h.in cheaders ext_l10n.h version.C.in \
        Variables.h \
        counters.C \
        counters.h
- 
-ETAGS_ARGS = --lang=c++
-BOOST_INCLUDES = -I$(top_srcdir)/boost
+
 INCLUDES = $(SIGC_CFLAGS) $(BOOST_INCLUDES) $(PSPELL_INCLUDES)
 localedir = $(datadir)/locale
 BUILT_SOURCES = version.C
@@ -66,7 +68,6 @@ lyx_SOURCES = \
        LyXAction.h \
        LyXView.C \
        LyXView.h \
-       Makefile.in \
        MenuBackend.C \
        MenuBackend.h \
        Painter.C \

diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am
index c34d6260f434b46f919d43ffb80e95e35e6088c9..892ca2944a408d2bfc028b51c5b42b9078997ebe 100644 (file)
--- a/src/frontends/Makefile.am
+++ b/src/frontends/Makefile.am
@@ -1,16 +1,11 @@
-AUTOMAKE_OPTIONS = foreign 1.4
-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.
+include $(top_srcdir)/config/common.am
+
 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
 
+INCLUDES = $(FRONTEND_INCLUDES) -I$(srcdir)/..  $(SIGC_CFLAGS) $(BOOST_INCLUDES)
+
 libfrontends_la_LIBADD= @FRONTEND_GUILIB@ \
        controllers/*.lo
 

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

diff --git a/src/frontends/gnome/Makefile.am b/src/frontends/gnome/Makefile.am
index 4701a4130d63f2fad91c0c854a6cb186d07de862..a6e3d04948bc6341f93b0ece4bd8206f6e985d7b 100644 (file)
--- a/src/frontends/gnome/Makefile.am
+++ b/src/frontends/gnome/Makefile.am
@@ -1,10 +1,6 @@
-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/ \
@@ -12,9 +8,6 @@ INCLUDES = ${FRONTEND_INCLUDES} -I${top_srcdir}/src/ \
        -I${top_srcdir}/src/frontends/controllers \
        ${SIGC_CFLAGS} $(BOOST_INCLUDES)
 
-#libgnome_la_LIBADD = \
-#      @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
-
 if USE_BASIC_IMAGE_LOADER
 else
 XFORMSGIMAGE = ../xforms/xformsGImage.lo
@@ -78,7 +71,6 @@ xforms.lo: $(xforms_objects)
 #      ../xforms/input_validators.lo \
 #      ../xforms/RadioButtonGroup.lo \
 
-LIBS= 
 #LDFLAGS= $(libgnome_la_OBJADD)
 LYXDATADIRS = 
 

diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt2/Makefile.am
index f3888c8c4e8ebe58b65b5c65bb50634029d7a062..68ec14e780cf85d80cddf4f3f6ce9de8e8beb7ac 100644 (file)
--- a/src/frontends/qt2/Makefile.am
+++ b/src/frontends/qt2/Makefile.am
@@ -1,19 +1,17 @@
-AUTOMAKE_OPTIONS = foreign 1.4
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-DISTCLEANFILES = $(BUILTSOURCES) *.orig *.rej *~ *.bak core
-ETAGS_ARGS = --lang=c++
+include $(top_srcdir)/config/common.am
+
+DISTCLEANFILES += $(BUILTSOURCES)
+
+SUBDIRS = xforms ui moc
 
 noinst_LTLIBRARIES = libqt2.la
 
-BOOST_INCLUDES = -I$(top_srcdir)/boost
-SUBDIRS=xforms ui moc
-INCLUDES = -I${top_srcdir}/src/ -I${top_srcdir}/src/frontends/ \
-       ${SIGC_CFLAGS} -I$(top_srcdir)/images ${FRONTEND_INCLUDES} $(BOOST_INCLUDES) \
+INCLUDES = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \
+       $(SIGC_CFLAGS) -I$(top_srcdir)/images \
+       $(FRONTEND_INCLUDES) $(BOOST_INCLUDES) \
        -I$(top_srcdir)/src/frontends/controllers
-AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
 
-
-LIBS=
+AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
 
 include Makefile.dialogs
 

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

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

diff --git a/src/frontends/qt2/ui/moc/Makefile.am b/src/frontends/qt2/ui/moc/Makefile.am
index 27a5e167858fadb7ea5c12d1daee677bdab0a3cb..26da688932e3baa965ce322441d38236677c2f93 100644 (file)
--- a/src/frontends/qt2/ui/moc/Makefile.am
+++ b/src/frontends/qt2/ui/moc/Makefile.am
@@ -1,17 +1,16 @@
-AUTOMAKE_OPTIONS = foreign 1.4
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-DISTCLEANFILES = $(libqt2uimoc_la_SOURCES) *.orig *.rej *~ *.bak core
-ETAGS_ARGS = --lang=c++
+include $(top_srcdir)/config/common.am
+
+DISTCLEANFILES += $(libqt2uimoc_la_SOURCES)
 
 noinst_LTLIBRARIES = libqt2uimoc.la
 
-BOOST_INCLUDES = -I$(top_srcdir)/boost
 INCLUDES = -I${top_srcdir}/src/ \
        -I${top_srcdir}/src/frontends/ \
        -I${top_srcdir}/src/frontends/controllers \
        ${SIGC_CFLAGS} \
        ${FRONTEND_INCLUDES} \
        $(BOOST_INCLUDES)
+
 AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
 
 include ../../Makefile.dialogs

diff --git a/src/frontends/qt2/xforms/Makefile.am b/src/frontends/qt2/xforms/Makefile.am
index a55dbb3bffb3e6bafae24ceabb7ced6b3e71173e..1895c93992a3fb294e01b8211c0703cb367208eb 100644 (file)
--- a/src/frontends/qt2/xforms/Makefile.am
+++ b/src/frontends/qt2/xforms/Makefile.am
@@ -1,17 +1,12 @@
-AUTOMAKE_OPTIONS = foreign 1.4
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-DISTCLEANFILES = $(XFORMS_SOURCES) $(BUILTSOURCES) *.orig *.rej *~ *.bak core
+include $(top_srcdir)/config/common.am
 
 noinst_LTLIBRARIES = libqt2xforms.la
 
-BOOST_INCLUDES = -I$(top_srcdir)/boost
 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
 
-LIBS=
-ETAGS_ARGS = --lang=c++
-
 EXTRA_DIST = xformsGImage.C xformsGImage.h
 
 if USE_BASIC_IMAGE_LOADER

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

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

diff --git a/src/insets/Makefile.am b/src/insets/Makefile.am
index 08ffa1479ccdc9f161b3197598a3ec1d8021e83d..55649e2bd13c248c8b504d35457cc821191dadd0 100644 (file)
--- a/src/insets/Makefile.am
+++ b/src/insets/Makefile.am
@@ -1,10 +1,7 @@
-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES= *.orig *.rej *~ *.bak core
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+include $(top_srcdir)/config/common.am
+
 noinst_LTLIBRARIES = libinsets.la
-LIBS =
-ETAGS_ARGS = --lang=c++
-BOOST_INCLUDES = -I$(top_srcdir)/boost
+
 INCLUDES = -I${srcdir}/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES)
 
 EXTRA_DIST = \

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 8580cbaf58c2a9820c707859e8f284c3589adbe4..1536c2911c91d8b7a8a24bb53ffb2c7855511571 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,11 +1,7 @@
-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES= *.orig *.rej *~ *.bak core
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+include $(top_srcdir)/config/common.am
+
 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)
 
 EXTRA_DIST = lyxstring.C lyxstring.h regex.c lyxregex.h \