diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2008-02-29 15:40:00 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2008-02-29 15:40:00 +0000 |
commit | 2b049d253dc2dfcbddc656ee3bffedf9f65a67b2 (patch) | |
tree | 11d05560a28146f8bb03fe436ae00e5e5ffd2712 /Build/source/texk/make | |
parent | b18fbbf19bcc21a491e8c0145b1d7b2d3507ef21 (diff) |
next step in autotools update
add autoheader in reautoconf script and maintainer rules
(maintainer mode still has some problems)
remove need for acconfig.h (templates via AC_DEFINE)
svn:ignore atom4te.cache directories
reautoconf of the whole tree
git-svn-id: svn://tug.org/texlive/trunk@6773 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/make')
-rw-r--r-- | Build/source/texk/make/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/texk/make/config.mk | 52 |
2 files changed, 31 insertions, 27 deletions
diff --git a/Build/source/texk/make/ChangeLog b/Build/source/texk/make/ChangeLog index 14c15170570..a43b78ac026 100644 --- a/Build/source/texk/make/ChangeLog +++ b/Build/source/texk/make/ChangeLog @@ -1,4 +1,8 @@ -2008-02-02 Peter Breitenlohner <peb@mppmu.mpg.de> +2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de> + + * config.mk: update and reactivate maintainer rules. + +2008-02-25 Peter Breitenlohner <peb@mppmu.mpg.de> * config.mk: temporarily disable maintainer rules, they need to be updated for Autoconf 2.59+. diff --git a/Build/source/texk/make/config.mk b/Build/source/texk/make/config.mk index cc9080eb71d..0cec93b225b 100644 --- a/Build/source/texk/make/config.mk +++ b/Build/source/texk/make/config.mk @@ -1,36 +1,36 @@ # config.mk -- autoconf rules to remake the Makefile, c-auto.h, etc. -@MAINT@## ac_dir = $(top_srcdir)/../etc/autoconf -@MAINT@## autoconf = $(ac_dir)/acspecific.m4 $(ac_dir)/acgeneral.m4 $(ac_dir)/acsite.m4 -@MAINT@## autoheader = $(ac_dir)/acconfig.h $(ac_dir)/autoheader.m4 -@MAINT@## -@MAINT@## # I define $(autoconf) to acgeneral.m4 and the other Autoconf files, so -@MAINT@## # configure automatically gets remade in the sources with a new Autoconf -@MAINT@## # release. But it would be bad for installers with Autoconf to remake -@MAINT@## # configure (not to mention require Autoconf), so I take out the variable -@MAINT@## # $(autoconf) definition before release. -@MAINT@## # -@MAINT@## # BTW, xt.ac isn't really required for dvipsk or dviljk, but it doesn't -@MAINT@## # seem worth the trouble. -@MAINT@## # -@MAINT@## configure_in = $(srcdir)/configure.in $(kpathsea_srcdir)/common.ac \ -@MAINT@## $(kpathsea_srcdir)/withenable.ac $(kpathsea_srcdir)/xt.ac \ -@MAINT@## $(kpathsea_srcdir_parent)/libtool.m4 -@MAINT@## $(srcdir)/configure: $(configure_in) $(autoconf) -@MAINT@## cd $(srcdir) && $(top_srcdir)/../autoconf2.13 -m $(ac_dir) +@MAINT@# BTW, xt.ac isn't really required for dvipsk or dviljk, but it doesn't +@MAINT@# seem worth the trouble. +@MAINT@# +@MAINT@configure_in = $(top_srcdir)/configure.in $(kpathsea_srcdir)/common.ac \ +@MAINT@ $(kpathsea_srcdir)/withenable.ac $(kpathsea_srcdir)/xt.ac \ +@MAINT@ $(kpathsea_srcdir_parent)/libtool.m4 $(top_srcdir)/../m4/*.m4 +@MAINT@ +@MAINT@aclocal_m4 = $(top_srcdir)/stamp-aclocal $(top_srcdir)/aclocal.m4 +@MAINT@ +@MAINT@$(top_srcdir)/stamp-aclocal: $(configure_in) +@MAINT@ cd $(top_srcdir) && aclocal -I ../m4 +@MAINT@ date >$(top_srcdir)/stamp-aclocal +@MAINT@# For the case that aclocal.m4 is missing +@MAINT@$(top_srcdir)/aclocal.m4: +@MAINT@ cd $(top_srcdir) && aclocal -I ../m4 +@MAINT@ date >$(top_srcdir)/stamp-aclocal +@MAINT@ +@MAINT@$(top_srcdir)/configure: $(configure_in) $(aclocal_m4) +@MAINT@ cd $(top_srcdir) && autoconf +@MAINT@ +@MAINT@$(top_srcdir)/c-auto.in: $(top_srcdir)/stamp-auto.in +@MAINT@$(top_srcdir)/stamp-auto.in: $(configure_in) $(aclocal_m4) +@MAINT@ cd $(top_srcdir) && autoheader +@MAINT@ date >$(top_srcdir)/stamp-auto.in -config.status: $(srcdir)/configure +config.status: $(top_srcdir)/configure $(SHELL) $@ --recheck +# FIXME: Shouldn't this be $(top_builddir)/config.status Makefile: config.status $(srcdir)/Makefile.in $(top_srcdir)/../make/*.mk $(SHELL) $< -@MAINT@## # autoheader reads acconfig.h (and c-auto.h.top) automatically. -@MAINT@## $(srcdir)/c-auto.in: $(srcdir)/stamp-auto.in -@MAINT@## $(srcdir)/stamp-auto.in: $(configure_in) $(autoheader) \ -@MAINT@## $(kpathsea_srcdir)/acconfig.h -@MAINT@## cd $(srcdir) && autoheader -m $(ac_dir) -l $(srcdir) -@MAINT@## date >$(srcdir)/stamp-auto.in - # This rule isn't used for the top-level Makefile, but it doesn't hurt. # We don't depend on config.status because configure always rewrites # config.status, even when it doesn't change. Thus it might be newer |