diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | Makefile.in | 9 |
3 files changed, 25 insertions, 5 deletions
@@ -1,3 +1,15 @@ +2011-10-25 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (dist-hook): Use `cd $(srcdir)/pc' so that + `make distcheck' works completely. + +2011-10-25 Stefano Lattarini <stefano.lattarini@gmail.com> + + dist: generated file `version.c' is not removed by "make distclean" + + * Makefile.am (distcleancheck_listfiles): Define to ignore the + generated `version.c' file. + 2011-10-24 Arnold D. Robbins <arnold@skeeve.com> * dfa.c (wcscoll): Create for VMS. diff --git a/Makefile.am b/Makefile.am index 29903f9f..aeff42f5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -63,6 +63,11 @@ EXTRA_DIST = \ vms \ ylwrap +# It's OK for the generated file `version.c' not to be removed by +# "make distclean". +distcleancheck_listfiles = \ + find . -type f -print | grep -v '^\./version\.c$$' + # The order to do things in. # Build explicitly in "." in order to build gawk first, so # that `make check' without a prior `make' works. @@ -114,8 +119,6 @@ gawk_SOURCES = $(base_sources) eval.c profile.c pgawk_SOURCES = $(base_sources) eval_p.c profile_p.c dgawk_SOURCES = $(base_sources) eval_d.c profile.c cmd.h command.y debug.c -distcleancheck_listfiles = version.c - # Get extra libs as needed, Automake will supply LIBINTL and SOCKET_LIBS. LDADD = $(LIBSIGSEGV) $(LIBINTL) $(SOCKET_LIBS) dgawk_LDADD = $(LDADD) @LIBREADLINE@ @@ -165,7 +168,7 @@ check-local: gawk$(EXEEXT) pgawk$(EXEEXT) # And additional set up for the pc directory. dist-hook: cd $(distdir)/extension ; rm -f *.o *.so - cd pc ; \ + cd $(srcdir)/pc ; \ sed -n -f configpk.sed < ../configure.ac > tmp.sed ; \ sed -f config.sed < ../configh.in > config.tmp ; \ sed -f tmp.sed < config.tmp > config.h ; \ diff --git a/Makefile.in b/Makefile.in index 89ac4ddd..c8208d94 100644 --- a/Makefile.in +++ b/Makefile.in @@ -338,6 +338,12 @@ EXTRA_DIST = \ ylwrap +# It's OK for the generated file `version.c' not to be removed by +# "make distclean". +distcleancheck_listfiles = \ + find . -type f -print | grep -v '^\./version\.c$$' + + # The order to do things in. # Build explicitly in "." in order to build gawk first, so # that `make check' without a prior `make' works. @@ -386,7 +392,6 @@ base_sources = \ gawk_SOURCES = $(base_sources) eval.c profile.c pgawk_SOURCES = $(base_sources) eval_p.c profile_p.c dgawk_SOURCES = $(base_sources) eval_d.c profile.c cmd.h command.y debug.c -distcleancheck_listfiles = version.c # Get extra libs as needed, Automake will supply LIBINTL and SOCKET_LIBS. LDADD = $(LIBSIGSEGV) $(LIBINTL) $(SOCKET_LIBS) @@ -1030,7 +1035,7 @@ check-local: gawk$(EXEEXT) pgawk$(EXEEXT) # And additional set up for the pc directory. dist-hook: cd $(distdir)/extension ; rm -f *.o *.so - cd pc ; \ + cd $(srcdir)/pc ; \ sed -n -f configpk.sed < ../configure.ac > tmp.sed ; \ sed -f config.sed < ../configh.in > config.tmp ; \ sed -f tmp.sed < config.tmp > config.h ; \ |