This is a think I have been planning to do with the makefiles for a
long time. I am sure there are details that can be imporved, but this
should make sure that the Makefile.am's are a lot more uniform.
Please comment.
? build
? confdefs.h
Index: Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/Makefile.am,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile.am
--- Makefile.am 11 Mar 2002 23:02:03 -0000 1.28
+++ Makefile.am 12 Mar 2002 18:13:28 -0000
@@ -1,19 +1,11 @@
-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES = -r *.orig *.rej *~ *.bak lyx.1 core \
- 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 \
- $(srcdir)/configure $(srcdir)/development/lyx.spec \
- $(srcdir)/acinclude.m4 $(srcdir)/sourcedoc/Doxyfile
+include $(top_srcdir)/config/include.am
+
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
@@ -57,10 +49,6 @@ bindist:
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)/*
Index: config/include.am
===================================================================
RCS file: config/include.am
diff -N config/include.am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ config/include.am 12 Mar 2002 18:13:28 -0000
@@ -0,0 +1,17 @@
+AUTOMAKE_OPTIONS = foreign 1.5
+
+DISTCLEANFILES= -r *.orig *.rej *~ *.bak lyx.1 core libintl.h config.h 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)/config.h.in \
+ $(srcdir)/aclocal.m4 \
+ $(srcdir)/configure $(srcdir)/development/lyx.spec \
+ $(srcdir)/acinclude.m4 $(srcdir)/sourcedoc/Doxyfile
+
+
+ETAGS_ARGS = --lang=c++
+
+BOOST_INCLUDES = -I$(top_srcdir)/boost
+SIGC_INCLUDES = -I$(top_srcdir) -I$(top_builddir)
Index: src/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Makefile.am,v
retrieving revision 1.113
diff -u -p -r1.113 Makefile.am
--- src/Makefile.am 12 Mar 2002 17:15:44 -0000 1.113
+++ src/Makefile.am 12 Mar 2002 18:13:29 -0000
@@ -1,7 +1,7 @@
-AUTOMAKE_OPTIONS = foreign
+include $(top_srcdir)/config/include.am
+
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 +22,7 @@ EXTRA_DIST = config.h.in stamp-h.in chea
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
Index: src/frontends/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/Makefile.am,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile.am
--- src/frontends/Makefile.am 1 Mar 2002 15:08:12 -0000 1.26
+++ src/frontends/Makefile.am 12 Mar 2002 18:13:29 -0000
@@ -1,15 +1,10 @@
-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/include.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
Index: src/frontends/xforms/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/Makefile.am,v
retrieving revision 1.60
diff -u -p -r1.60 Makefile.am
--- src/frontends/xforms/Makefile.am 11 Mar 2002 09:54:42 -0000 1.60
+++ src/frontends/xforms/Makefile.am 12 Mar 2002 18:13:29 -0000
@@ -1,15 +1,13 @@
-AUTOMAKE_OPTIONS = foreign 1.4
-DISTCLEANFILES= *.orig *.rej *~ *.bak core
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+include $(top_srcdir)/config/include.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
Index: src/graphics/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/Makefile.am,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile.am
--- src/graphics/Makefile.am 6 Mar 2002 12:07:23 -0000 1.11
+++ src/graphics/Makefile.am 12 Mar 2002 18:13:29 -0000
@@ -1,10 +1,7 @@
-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES= *.orig *.rej *~ *.bak core
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+include $(top_srcdir)/config/include.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
Index: src/insets/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/Makefile.am,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile.am
--- src/insets/Makefile.am 28 Feb 2002 14:06:24 -0000 1.42
+++ src/insets/Makefile.am 12 Mar 2002 18:13:29 -0000
@@ -1,10 +1,7 @@
-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES= *.orig *.rej *~ *.bak core
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+include $(top_srcdir)/config/include.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 = \
Index: src/mathed/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/Makefile.am,v
retrieving revision 1.81
diff -u -p -r1.81 Makefile.am
--- src/mathed/Makefile.am 12 Mar 2002 14:59:07 -0000 1.81
+++ src/mathed/Makefile.am 12 Mar 2002 18:13:29 -0000
@@ -1,10 +1,7 @@
-AUTOMAKE_OPTIONS = foreign 1.4
-DISTCLEANFILES= *.orig *.rej *~ *.bak core
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+include $(top_srcdir)/config/include.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 = \
Index: src/support/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/Makefile.am,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile.am
--- src/support/Makefile.am 27 Feb 2002 11:34:19 -0000 1.40
+++ src/support/Makefile.am 12 Mar 2002 18:13:29 -0000
@@ -1,11 +1,7 @@
-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES= *.orig *.rej *~ *.bak core
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+include $(top_srcdir)/config/include.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 \
--
Lgb
