Changes to m4/Makefile.am,v

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Changes by:     Eric Blake <ericb>      06/06/19 19:10:19

Index: Makefile.am
===================================================================
RCS file: /sources/m4/m4/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- Makefile.am 19 Jun 2006 17:25:32 -0000      1.33
+++ Makefile.am 19 Jun 2006 19:10:19 -0000      1.34
@@ -83,7 +83,14 @@
 src_m4_CPPFLAGS        = $(AM_CPPFLAGS) -Isrc -I$(srcdir)/src $(LTDLINCL)
 src_m4_LDFLAGS = $(AM_LDFLAGS) $(DLPREOPEN)
 src_m4_LDADD   = m4/libm4.la
-src_m4_DEPENDENCIES = $(PREOPEN_DEPENDENCIES)
+src_m4_DEPENDENCIES = $(PREOPEN_DEPENDENCIES) m4/libm4.la
+
+## Since we do not build a libtool library in src, Automake fails to infer
+## that there may be a libs directory there.  FIXME - revisit this if
+## automake 1.10 fixes the bug.
+clean-local-src:
+       -rm -rf src/.libs src/_libs
+
 
 ##                                                                      ##
 ##                 --- PASTED MANUALLY FROM GNULIB ---                  ##
@@ -160,6 +167,9 @@
 ## perlxsi.c:
 ##     $(PERL) -MExtUtils::Embed -e xsinit -- -o perlxsi.c
 
+## but we should still distribute it, because it is listed in POTFILES.in:
+EXTRA_DIST += modules/perl.c
+
 module_check   = -rpath /dev/null
 check_LTLIBRARIES = \
                  modules/import.la \
@@ -406,7 +416,7 @@
          AUTOTEST_PATH="$(bindir)" $(TESTSUITEFLAGS)
 
 # We need to remove any file droppings left behind by testsuite.
-clean-local:
+clean-local-tests:
        $(CD_TESTDIR); \
        test ! -f '$(abs_srcdir)/tests/testsuite' || \
          $(SHELL) '$(abs_srcdir)/tests/testsuite' --clean
@@ -416,6 +426,8 @@
 DISTCLEANFILES += tests/atconfig tests/atlocal tests/m4
 MAINTAINERCLEANFILES += tests/generated.at '$(TESTSUITE)'
 
+clean-local: clean-local-src clean-local-tests
+
 ##                                                                      ##
 ##                   --- RULES FOR THE MAINTAINER ---                   ##
 ##           You shouldn't need to touch anything below here.           ##