[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Changes to m4/Makefile.am
|
From: |
Gary V . Vaughan |
|
Subject: |
Changes to m4/Makefile.am |
|
Date: |
Wed, 04 May 2005 11:45:45 -0400 |
Index: m4/Makefile.am
diff -u m4/Makefile.am:1.20 m4/Makefile.am:1.21
--- m4/Makefile.am:1.20 Sun May 1 11:10:03 2005
+++ m4/Makefile.am Wed May 4 15:45:43 2005
@@ -1,6 +1,6 @@
-## Makefile.am -- Process this file with automake to produce Makefile.in
+## This file is part of GNU M4.
##
-## Copyright (C) 2000, 2003 Free Software Foundation
+## Copyright (C) 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -19,23 +19,39 @@
##
## Written by Gary V. Vaughan <address@hidden>
-EXTRA_DIST = bootstrap config/mkstamp
+config_aux_dir = ltdl/config
+config_macro_dir= ltdl/m4
-## There is currently no means with Automake not to run aclocal.
-ACLOCAL_AMFLAGS = -I acm4
+SUBDIRS = ltdl po gnu .
-SUBDIRS = po gnu libltdl m4 modules src tests examples
doc .
-MAINTAINERCLEANFILES = ABOUT-NLS COPYING INSTALL Makefile.in aclocal.m4 \
- config-h.in configure stamp-h.in \
- po/cat-id-tbl.c po/m4.pot po/stamp-cat-id
+ACLOCAL_AMFLAGS = -I ltdl/m4
+AM_CPPFLAGS = -I. -I$(srcdir) \
+ -Ignu -I$(srcdir)/gnu \
+ -Im4 -I$(srcdir)/m4\
+ $(INTLINCL)
+AM_LDFLAGS = -no-undefined -export-dynamic
+
+EXTRA_DIST = bootstrap $(config_aux_dir)/mkstamp
+CLEANFILES =
+DISTCLEANFILES =
+MOSTLYCLEANFILES=
+MAINTAINERCLEANFILES = \
+ ABOUT-NLS COPYING INSTALL Makefile.in aclocal.m4 \
+ config-h.in configure stamp-h.in \
+ po/cat-id-tbl.c po/m4.pot po/stamp-cat-id
+
+BUILT_SOURCES =
+
+# Using `cd' in backquotes may print the directory name, use this instead:
+m4__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
# Make sure config.status is regenerated when the version timestamp changes
-MKSTAMP = $(SHELL) $(top_srcdir)/config/mkstamp
+MKSTAMP = $(SHELL) $(srcdir)/$(config_aux_dir)/mkstamp
CONFIG_STATUS_DEPENDENCIES = stamp-vcl
-stamp-vcl: vcl.tmp $(top_srcdir)/ChangeLog
+stamp-vcl: vcl.tmp $(srcdir)/ChangeLog
vcl.tmp:
@dir=.; test -f $$dir/stamp-vcl || dir=$(srcdir); \
- set `$(MKSTAMP) < $(top_srcdir)/ChangeLog`; \
+ set `$(MKSTAMP) < $(srcdir)/ChangeLog`; \
echo "$$1" > vcl.tmp; \
cmp -s vcl.tmp $$dir/stamp-vcl \
## If mkstamp does not match $(srcdir)/stamp-vcl, we still put the new one
@@ -45,6 +61,350 @@
|| (echo "Updating stamp-vcl"; cp vcl.tmp ./stamp-vcl)
address@hidden -f vcl.tmp
+
+## ------- ##
+## GNU M4. ##
+## ------- ##
+
+bin_PROGRAMS = src/m4
+src_m4_SOURCES = \
+ src/getopt.c \
+ src/getopt1.c \
+ src/getopt.h \
+ src/version-etc.c \
+ src/version-etc.h \
+ src/main.c \
+ src/m4.h \
+ src/freeze.c \
+ src/stackovf.c
+src_m4_CPPFLAGS = $(AM_CPPFLAGS) -Isrc -I$(srcdir)/src $(LTDLINCL)
+src_m4_LDFLAGS = $(AM_LDFLAGS) $(DLPREOPEN)
+src_m4_LDADD = m4/libm4.la
+
+## ##
+## --- PASTED MANUALLY FROM GNULIB --- ##
+## To avoid adding unnecessary objects to libm4.la these gnulib ##
+## modules are not imported by gnulib-tool, but added manually. ##
+## (from: gnulib-tool --extract-automake-snippet getopt version-etc) ##
+## ##
+BUILT_SOURCES += src/$(GETOPT_H)
+EXTRA_DIST += src/getopt_.h src/getopt_int.h
+
+# We need the following in order to create an <getopt.h> when the
+# system doesn't have one that works with the given compiler.
+all-local: src/$(GETOPT_H)
+src/getopt.h: src/getopt_.h
+ cp $(srcdir)/src/getopt_.h address@hidden
+ mv address@hidden $@
+MOSTLYCLEANFILES += src/getopt.h src/getopt.h-t
+## ##
+## --- END OF PASTED GNULIB --- ##
+## ##
+
+## -------- ##
+## Modules. ##
+## -------- ##
+
+pkgmodincludedir= $(includedir)/$(PACKAGE)/modules
+pkglibexecdir = $(libexecdir)/$(PACKAGE)
+
+ETAGS_ARGS = --regex='/M4BUILTIN_HANDLER[ \t]*)\([^)]*\)/\1/'
+
+module_ldflags = -module
+module_libadd = m4/libm4.la
+
+pkgmodinclude_HEADERS = modules/m4.h
+
+pkglibexec_LTLIBRARIES = \
+ modules/gnu.la \
+ modules/load.la \
+ modules/m4.la \
+ modules/traditional.la
+
+EXTRA_modules_gnu_la_SOURCES = modules/format.c
+modules_gnu_la_LDFLAGS = $(module_ldflags)
+modules_gnu_la_LIBADD = $(module_libadd)
+EXTRA_DIST += $(EXTRA_modules_gnu_la_SOURCES)
+
+modules_load_la_LDFLAGS = $(module_ldflags)
+modules_load_la_LIBADD = $(module_libadd)
+
+EXTRA_modules_m4_la_SOURCES = modules/evalparse.c
+modules_m4_la_LDFLAGS = $(module_ldflags)
+modules_m4_la_LIBADD = $(module_libadd)
+EXTRA_DIST += $(EXTRA_modules_m4_la_SOURCES)
+
+modules_traditional_la_LDFLAGS = $(module_ldflags)
+modules_traditional_la_LIBADD = $(module_libadd)
+
+if USE_GMP
+pkglibexec_LTLIBRARIES += modules/mpeval.la
+EXTRA_modules_mpeval_la_SOURCES = modules/evalparse.c
+modules_mpeval_la_LDFLAGS = $(module_ldflags)
+modules_mpeval_la_LIBADD = $(module_libadd)
+endif
+
+## Disabled for now. It is too fragile to be useful.
+## pkglibexec_LTLIBRARIES += modules/perl.la
+## modules_perl_la_CPPFLAGS = `$(PERL) -MExtUtils::Embed -e ccopts`
+## modules_perl_la_LDFLAGS = \
+## $(module_ldflags) `$(PERL) -MExtUtils::Embed -e ldopts`
+## modules_perl_la_LIBADD = $(module_libadd)
+## BUILT_SOURCES = perlxsi.c
+## DISTCLEANFILES += $(BUILT_SOURCES)
+##
+## perlxsi.c:
+## $(PERL) -MExtUtils::Embed -e xsinit -- -o perlxsi.c
+
+module_check = -rpath /dev/null
+check_LTLIBRARIES = \
+ modules/import.la \
+ modules/modtest.la \
+ modules/shadow.la \
+ modules/stdlib.la \
+ modules/time.la
+
+modules_import_la_LDFLAGS = $(module_ldflags) $(module_check)
+modules_import_la_LIBADD = $(module_libadd)
+
+modules_modtest_la_LDFLAGS = $(module_ldflags) $(module_check)
+modules_modtest_la_LIBADD = $(module_libadd)
+
+modules_shadow_la_LDFLAGS = $(module_ldflags) $(module_check)
+modules_shadow_la_LIBADD = $(module_libadd)
+
+modules_stdlib_la_LDFLAGS = $(module_ldflags) $(module_check)
+modules_stdlib_la_LIBADD = $(module_libadd)
+
+modules_time_la_LDFLAGS = $(module_ldflags) $(module_check)
+modules_time_la_LIBADD = $(module_libadd)
+
+EXTRA_DIST += \
+ modules/modtest.m4 \
+ modules/shadow.m4 \
+ modules/time.m4 \
+ modules/time2.m4 \
+ modules/stdlib.m4
+
+## ----- ##
+## libm4 ##
+## ----- ##
+
+lib_LTLIBRARIES = m4/libm4.la
+
+nobase_include_HEADERS = \
+ m4/m4module.h
+nobase_pkginclude_HEADERS = \
+ m4/hash.h \
+ m4/system.h
+m4_libm4_la_SOURCES = \
+ m4/builtin.c \
+ m4/debug.c \
+ m4/hash.c \
+ m4/input.c \
+ m4/m4.c \
+ m4/m4private.h \
+ m4/macro.c \
+ m4/module.c \
+ m4/output.c \
+ m4/path.c \
+ m4/pathconf.h \
+ m4/symtab.c \
+ m4/syntax.c \
+ m4/utility.c
+m4_libm4_la_LIBADD = gnu/libgnu.la \
+ $(LIBLTDL) $(LTLIBINTL) $(LIBADD_DL)
+m4_libm4_la_DEPENDENCIES = $(LIBLTDL)
+
+m4/pathconf.h:
+ echo "#define MODULE_PATH \"$(pkglibexecdir)\"" > m4/pathconf.h
+
+MOSTLYCLEANFILES += m4/pathconf.h
+BUILT_SOURCES += m4/pathconf.h
+
+# This file needs to be regenerated at configure time.
+dist-hook:
+ rm -f $(distdir)/m4/system.h
+EXTRA_DIST += m4/system_.h
+
+
+## ------- ##
+## libltdl ##
+## ------- ##
+
+ltdl/libltdlc.la:
+ cd ltdl && $(MAKE) $(MAKEFLAGS) libltdlc.la
+
+## -------------- ##
+## Documentation. ##
+## -------------- ##
+
+info_TEXINFOS = doc/m4.texinfo
+dist_man_MANS = $(srcdir)/doc/m4.1
+
+$(srcdir)/doc/m4.1: doc/helptoman.pl src/m4
+ @if test -f src/m4; then \
+ echo "Updating the \`man' page \`$@'"; \
+ $(PERL) $(srcdir)/doc/helptoman.pl src/m4 > address@hidden; \
+ cmp -s address@hidden $(srcdir)/doc/$@ || cp address@hidden
$(srcdir)/doc/$@; \
+ rm -f address@hidden; \
+ else \
+ echo "WARNING: The \`man' page \`$@' cannot be updated yet."; \
+ echo " Retry once the program executable will be ready."; \
+ fi
+
+## Disabled for now. Clashes with earlier definition.
+## TAGS_FILES = $(infos_TEXINFOS)
+## TAGS_DEPENDENCIES = $(TAGS_FILES)
+## ETAGS_ARGS = --language=none --regex='/@node \([^,]*\)/\1/' $(TAGS_FILES)
+
+EXTRA_DIST += doc/helptoman.pl
+
+MAINTAINERCLEANFILES += $(dist_man_MANS)
+
+
+## --------- ##
+## Examples. ##
+## --------- ##
+
+EXTRA_DIST += \
+ examples/WWW/Makefile \
+ examples/WWW/_footer.htm \
+ examples/WWW/_header.htm \
+ examples/WWW/man/Makefile \
+ examples/WWW/m4lib/bugs.m4 \
+ examples/WWW/m4lib/changelog.m4 \
+ examples/WWW/m4lib/download.m4 \
+ examples/WWW/m4lib/features.m4 \
+ examples/WWW/m4lib/feedback.m4 \
+ examples/WWW/m4lib/html.m4 \
+ examples/WWW/m4lib/index.m4 \
+ examples/WWW/m4lib/layout.m4 \
+ examples/WWW/m4lib/lists.m4 \
+ examples/WWW/m4lib/menu.m4 \
+ examples/WWW/m4lib/modules.m4 \
+ examples/WWW/m4lib/news.m4 \
+ examples/WWW/m4lib/readme.m4 \
+ examples/WWW/m4lib/setup.m4 \
+ examples/WWW/m4lib/test.m4 \
+ examples/WWW/m4lib/thanks.m4 \
+ examples/WWW/m4lib/thissite.m4 \
+ examples/WWW/m4lib/tmpl.m4 \
+ examples/WWW/m4lib/todo.m4 \
+ examples/WWW/m4lib/uses.m4 \
+ examples/WWW/m4lib/visions.m4 \
+ examples/WWW/m4lib/whatis.m4
+
+dist_pkgdata_DATA = \
+ examples/capitalize.m4 \
+ examples/comments.m4 \
+ examples/ddivert.m4 \
+ examples/debug.m4 \
+ examples/esyscmd.m4 \
+ examples/exp.m4 \
+ examples/foreach.m4 \
+ examples/forloop.m4 \
+ examples/fstab.m4 \
+ examples/hanoi.m4 \
+ examples/incl-test.m4 \
+ examples/include.m4 \
+ examples/indir.m4 \
+ examples/misc.m4 \
+ examples/multiquotes.m4 \
+ examples/patsubst.m4 \
+ examples/pushpop.m4 \
+ examples/regexp.m4 \
+ examples/reverse.m4 \
+ examples/sysv-args.m4 \
+ examples/trace.m4 \
+ examples/translit.m4 \
+ examples/undivert.incl \
+ examples/undivert.m4 \
+ examples/wrap.m4
+
+## ----------- ##
+## Test suite. ##
+## ----------- ##
+
+TESTSUITE = tests/testsuite
+TESTSUITE_AT = \
+ tests/builtins.at \
+ tests/generated.at \
+ tests/macros.at \
+ tests/modules.at \
+ tests/options.at \
+ tests/others.at \
+ tests/testsuite.at
+
+EXTRA_DIST += $(TESTSUITE) $(TESTSUITE_AT) $(OTHER_FILES) \
+ tests/atlocal.in \
+ tests/generate.awk \
+ tests/package.m4
+
+# Be sure to reexport important environment variables:
+TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \
+ CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" \
+ LIBS="$(LIBS)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
+ OBJEXT="$(OBJEXT)" EXEEXT="$(EXEEXT)" CONFIG_SHELL="$(SHELL)" \
+ CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" CXXCPP="$(CXXCPP)" \
+ F77="$(F77)" FFLAGS="$(FFLAGS)" \
+ GCJ="$(GCJ)" GCJFLAGS="$(GCJFLAGS)"
+
+# Using variables so that this snippet is not too wide and can
+# be used as is in Texinfo @example/@end example.
+m4_texinfo = $(srcdir)/doc/m4.texinfo
+generate = $(AWK) -f $(srcdir)/tests/generate.awk
+$(srcdir)/tests/generated.at: tests/generate.awk $(m4_texinfo)
+ $(generate) $(m4_texinfo) >address@hidden
+ mv address@hidden $@
+
+check-recursive: $(srcdir)/$(TESTSUITE)
+
+# Use `$(srcdir)' for the benefit of non-GNU makes: this is
+# how `testsuite' appears in our dependencies.
+AUTOM4TE = autom4te
+AUTOTEST = $(AUTOM4TE) --language=autotest
+$(srcdir)/$(TESTSUITE): tests/package.m4 $(TESTSUITE_AT)
+ cd $(srcdir)/tests; \
+ $(AUTOTEST) -I $(srcdir)/tests testsuite.at -o testsuite
+
+$(srcdir)/tests/package.m4: configure.ac
+ { \
+ echo '# Signature of the current package.'; \
+ echo 'm4_define([AT_PACKAGE_NAME], address@hidden@])'; \
+ echo 'm4_define([AT_PACKAGE_TARNAME], address@hidden@])'; \
+ echo 'm4_define([AT_PACKAGE_VERSION], address@hidden@])'; \
+ echo 'm4_define([AT_PACKAGE_STRING], address@hidden@])'; \
+ echo 'm4_define([AT_PACKAGE_BUGREPORT], address@hidden@])'; \
+ } > $(srcdir)/tests/package.m4
+
+tests/atconfig: config.status
+ $(SHELL) ./config.status tests/atconfig
+DISTCLEANFILES += tests/atconfig
+
+CD_TESTDIR = abs_srcdir=`$(m4__cd) $(srcdir) && pwd`; cd tests
+
+# Hook the test suite into the check rule
+check-local: tests/atconfig $(srcdir)/$(TESTSUITE)
+ $(CD_TESTDIR); \
+ $(TESTS_ENVIRONMENT) $(SHELL) $$abs_srcdir/$(TESTSUITE)
$(TESTSUITE_FLAGS)
+
+# Run the test suite on the *installed* tree.
+installcheck-local:
+ $(CD_TESTDIR); \
+ $(TESTS_ENVIRONMENT) $(SHELL) $$abs_srcdir/$(TESTSUITE)
$(TESTSUITE_FLAGS) AUTOTEST_PATH=$(exec_prefix)/bin
+
+# We need to remove any file droppings left behind by testsuite.
+clean-local:
+ -$(CD_TESTDIR); \
+ test -f $$abs_srcdir/$(TESTSUITE) && \
+ $(SHELL) $$abs_srcdir/$(TESTSUITE) --clean
+
+OTHER_FILES = tests/iso8859.m4 tests/stackovf.test
+
+DISTCLEANFILES += atconfig atlocal m4
+MAINTAINERCLEANFILES += generated.at $(TESTSUITE)
+
## ##
## --- RULES FOR THE MAINTAINER --- ##
## You shouldn't need to touch anything below here. ##