X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/eb7be85350a2dd971bb509e9191c33fc640cd0d5..b7a28feb2de95d5148a5918a8348047559f3c7ae:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 87cf0bd..6888d83 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,7 @@ ACLOCAL_AMFLAGS = -I m4 -I common/m4
 # For Gnulib
 MOSTLYCLEANFILES =
 EXTRA_LTLIBRARIES =
+EXTRA_PROGRAMS =
 
 AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/lib -I$(top_srcdir)/lib \
@@ -37,13 +38,17 @@ noinst_DATA = $(MOFILES)
 
 nodist_include_HEADERS = src/config/cdecl.h
 src/config/cdecl.h: config.h src/cdecl.h $(DX_BASEDIR)/scripts/bake-config.awk
-	$(AM_V_GEN) $(MKDIR_P) $(@D)
 	$(AM_V_at) $(AWK) -f $(DX_BASEDIR)/scripts/bake-config.awk \
 	  config.h $(srcdir)/src/cdecl.h >$@-t
 	$(AM_V_at) mv -f $@-t $@
 EXTRA_DIST += $(DX_BASEDIR)/scripts/bake-config.awk
 CLEANFILES += src/config/cdecl.h
 
+# Hack to get Automake to emit a dirstamp rule, and use it in src/config/cdecl.h.
+src/config/cdecl.h: src/config/$(am__dirstamp)
+EXTRA_PROGRAMS += src/config/gl-dirstamp
+src_config_gl_dirstamp_SOURCES =
+
 shared_gl_objects = $(gnulib_symfiles:.glsym=.lo)
 static_gl_objects = $(gnulib_extra_objects:.lo=.@OBJEXT@)
 
@@ -141,9 +146,9 @@ XGETTEXT_OPTS = -D $(builddir) -D $(srcdir) --from-code=utf-8 \
 	--keyword=_ --keyword=N_ --keyword=PN_:1c,2
 
 po/$(PACKAGE).pot: $(SOURCES)
-	$(AM_V_at)  $(MKDIR_P) $(@D)
-	$(AM_V_GEN) $(XGETTEXT) $(XGETTEXT_OPTS) -o $@.tmp $(SOURCES)
-	$(AM_V_at)  mv -f $@.tmp $@
+	$(AM_V_GEN) $(MKDIR_P) po
+	$(AM_V_at) $(XGETTEXT) $(XGETTEXT_OPTS) -o $@.tmp $(SOURCES)
+	$(AM_V_at) mv -f $@.tmp $@
 
 # These are required to prevent the builtin lex/yacc rules from
 # superseding ours...
@@ -345,7 +350,7 @@ CLEANFILES += atlocal
 # refer to the just-installed .la file, rather than more typical library flags
 # (-Lfoo -lfoo).  Otherwise libtool can pick up libcdecl.la from the current
 # working directory which defeats the point of an install check.
-EXTRA_PROGRAMS = t/installcheck
+EXTRA_PROGRAMS += t/installcheck
 t_installcheck_CPPFLAGS = -I$(DESTDIR)$(includedir)
 t_installcheck_LDADD = $(DESTDIR)$(libdir)/libcdecl.la
 t_installcheck_CFLAGS =