diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefile.am | 45 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 35 insertions, 21 deletions
@@ -1,3 +1,12 @@ +2004-02-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Remove AUTOMAKE_FILES. + Cleanup duplicate ACLOCAL_FILES. + EXTRA_DIST += config-ml.in. + DIST_SUBDIRS += make. + Add dist-hook. + * configure.ac: Add dist-bzip2 no-dist-gzip to AUTOMAKE_OPTIONS. + 2004-02-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * bootstrap: RTEMS_CHECK_BSPDIR(RTEMS_BSP_FAMILY). diff --git a/Makefile.am b/Makefile.am index 9fda4e4ceb..13faa3cc90 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,6 @@ # # top level directory for RTEMS build tree # -## The target's toplevel Makefile now is in c/src ## ## $Id$ ## @@ -10,41 +9,47 @@ ACLOCAL_AMFLAGS = -I aclocal SUBDIRS = make $(build_SUBDIRS) $(host_SUBDIRS) $(target_SUBDIRS) -AUTOMAKE_FILES = -AUTOMAKE_FILES += automake/host.am -AUTOMAKE_FILES += automake/local.am -AUTOMAKE_FILES += automake/subdirs.am - ACLOCAL_FILES = ACLOCAL_FILES += aclocal/bsp-alias.m4 ACLOCAL_FILES += aclocal/canonical-target-name.m4 ACLOCAL_FILES += aclocal/check-bsps.m4 ACLOCAL_FILES += aclocal/check-custom-bsp.m4 ACLOCAL_FILES += aclocal/enable-bare.m4 -ACLOCAL_FILES += aclocal/enable-cxx.m4 -ACLOCAL_FILES += aclocal/enable-inlines.m4 -ACLOCAL_FILES += aclocal/enable-itron.m4 -ACLOCAL_FILES += aclocal/enable-multiprocessing.m4 -ACLOCAL_FILES += aclocal/enable-networking.m4 -ACLOCAL_FILES += aclocal/enable-posix.m4 -ACLOCAL_FILES += aclocal/enable-rdbg.m4 -ACLOCAL_FILES += aclocal/enable-rtemsbsp.m4 -ACLOCAL_FILES += aclocal/enable-rtems-debug.m4 -ACLOCAL_FILES += aclocal/enable-tests.m4 -ACLOCAL_FILES += aclocal/multilib.m4 ACLOCAL_FILES += aclocal/path-ksh.m4 ACLOCAL_FILES += aclocal/project-root.m4 ACLOCAL_FILES += aclocal/quoting.m4 ACLOCAL_FILES += aclocal/rtems-cpu-subdirs.m4 -ACLOCAL_FILES += aclocal/rtems-top.m4 ACLOCAL_FILES += aclocal/tool-paths.m4 -ACLOCAL_FILES += aclocal/version.m4 noinst_SCRIPTS = bootstrap EXTRA_DIST = README.configure SUPPORT VERSION LICENSE $(noinst_SCRIPTS) -EXTRA_DIST += $(AUTOMAKE_FILES) EXTRA_DIST += $(ACLOCAL_FILES) +EXTRA_DIST += config-ml.in + +DIST_SUBDIRS = make +dist-hook: + cp -pR $(srcdir)/doc $(distdir)/doc + find $(distdir)/doc -name '*.t' -print | while read a; do \ + if test -f $${a}exi; then echo "rm $${a}exi"; rm -f $${a}exi; fi; done + cp -pR $(srcdir)/tools $(distdir)/tools + cp -pR $(srcdir)/c $(distdir)/c + cp -pR $(srcdir)/cpukit $(distdir)/cpukit + cp -pR $(srcdir)/testsuites $(distdir)/testsuites + cp -pR $(srcdir)/scripts $(distdir)/scripts + rm -f $(distdir)/scripts/setup.cache + rm -f $(distdir)/scripts/*/*.spec + rm -rf `find $(distdir) -name 'autom4te*'` + rm -rf `find $(distdir) -name CVS` + rm -f `find $(distdir) \( -name .cvsignore \ + -o -name config.status \ + -o -name config.log \)` + rm -f `find $(distdir) \( -name '*.bak' \ + -o -name 'changes' -o -name 'diff' -o -name 'tmp' -o -name 'log' \ + -o -name '*~' -o -name '.*~' -o -name '.#*' \)` + find $(distdir) -name '*.in' -print | while read a; do \ + f=`echo $$a | sed 's,\.in$$,,'`; \ + if test -f $$f; then echo "rm $$f"; rm $$f; fi; done include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/host.am diff --git a/configure.ac b/configure.ac index bb0a27dac7..60ea5d5433 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ AS_IF([test -f aclocal/version.m4],[ ]) AC_CANONICAL_TARGET([]) -AM_INIT_AUTOMAKE([no-define foreign 1.8.2]) +AM_INIT_AUTOMAKE([no-define foreign 1.8.2 dist-bzip2 no-dist-gzip]) AM_MAINTAINER_MODE ## These option are only in here to let --help report all supported |