[nautilus-actions] Fix make distcheck



commit f0c6dde8ebea224129ba9254cb304386325f6197
Author: Pierre Wieser <pwieser trychlos org>
Date:   Thu Feb 17 01:26:07 2011 +0100

    Fix make distcheck

 ChangeLog                  |    4 ++++
 docs/reference/Makefile.am |    4 ++--
 run-distcheck.sh           |    2 +-
 src/nact/Makefile.am       |    2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 53185e1..67e4e73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 2011-02-16 Pierre Wieser <pwieser trychlos org>
 
 	* docs/reference/Makefile.am:
+	* src/nact/Makefile.am:
+	* run-distcheck.sh: Fix make distcheck.
+
+	* docs/reference/Makefile.am:
 	Do not documente NAGconfMonitor class when deprecated symbols are disabled.
 
 	* src/api/na-data-boxed.h:
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 432dfa5..b02f992 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -95,14 +95,14 @@ IGNORE_HFILES = \
 
 # CFLAGS and LDFLAGS for compiling scan program.
 # Only needed if $(DOC_MODULE).types is non-empty.
-AM_CPPFLAGS += \
+AM_CPPFLAGS = \
 	-I $(top_srcdir)/src						\
 	$(NAUTILUS_ACTIONS_CFLAGS)					\
 	$(NULL)
 
 core_libdir = $(top_builddir)/src/core/.libs
 
-AM_LDFLAGS += \
+AM_LDFLAGS = \
 	$(NAUTILUS_ACTIONS_LIBS)					\
 	$(core_libdir)/libna-core.so				\
 	$(NULL)
diff --git a/run-distcheck.sh b/run-distcheck.sh
index 97ad0c6..f6f9ee8 100755
--- a/run-distcheck.sh
+++ b/run-distcheck.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-./run-autogen.sh &&
+autogen_target=doc ./run-autogen.sh &&
 make clean &&
 make &&
 make install &&
diff --git a/src/nact/Makefile.am b/src/nact/Makefile.am
index fccc4c5..d99e6fe 100644
--- a/src/nact/Makefile.am
+++ b/src/nact/Makefile.am
@@ -191,5 +191,5 @@ CLEANFILES = \
 EXTRA_DIST = \
 	$(applications_in_files)							\
 	$(pkgdata_DATA)										\
-	nact-marshal.list									\
+	nact-marshal.def									\
 	$(NULL)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]