[farsight2/master] Add forgotten files for plugin doc

Olivier Crête olivier.crete at collabora.co.uk
Tue Dec 23 15:25:23 PST 2008


---
 Makefile.am                |    6 ++++--
 common/Makefile.am         |   11 +++++++++++
 common/gtk-doc-plugins.mak |    4 +++-
 common/m4/Makefile.am      |   40 ++++++++++++++++++++++++++++++++++++++++
 configure.ac               |    2 ++
 5 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 common/Makefile.am
 create mode 100644 common/m4/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7a54148..7c734ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,8 @@ SUBDIRS = 			\
 	transmitters		\
 	$(PYTHON_SUBDIR)	\
 	tests 			\
-	docs
+	docs			\
+	common
 #	pkgconfig
 
 DIST_SUBDIRS = 			\
@@ -21,7 +22,8 @@ DIST_SUBDIRS = 			\
 	transmitters		\
 	python			\
 	tests 			\
-	docs
+	docs			\
+	common
 #	pkgconfig
 
 EXTRA_DIST = \
diff --git a/common/Makefile.am b/common/Makefile.am
new file mode 100644
index 0000000..6624198
--- /dev/null
+++ b/common/Makefile.am
@@ -0,0 +1,11 @@
+SUBDIRS = m4
+
+EXTRA_DIST = \
+	gtk-doc.mak \
+	gst-autogen.sh \
+	gst.supp \
+	check.mak \
+	gtk-doc-plugins.mak \
+	plugins.xsl \
+	gstdoc-scangobj \
+	gst-xmlinspect.py mangle-tmpl.py scangobj-merge.py
diff --git a/common/gtk-doc-plugins.mak b/common/gtk-doc-plugins.mak
index ba73865..a9c6296 100644
--- a/common/gtk-doc-plugins.mak
+++ b/common/gtk-doc-plugins.mak
@@ -29,6 +29,7 @@ TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)- at GST_MAJORMINOR@
 
 EXTRA_DIST = 				\
 	scanobj-build.stamp		\
+	scanobj-trans-build.stamp	\
 	$(srcdir)/inspect/*.xml		\
 	inspect.stamp			\
 	inspect-build.stamp		\
@@ -370,6 +371,7 @@ scanobj-trans-build.stamp: $(SCANOBJ_DEPS) $(basefiles)
 	if test x"$(srcdir)" != x. ; then				\
 	    for f in $(SCANOBJ_FILES);					\
 	    do								\
+	    	pwd \
 	        cp $(srcdir)/$$f . ;					\
 	    done;							\
 	else								\
@@ -382,7 +384,7 @@ scanobj-trans-build.stamp: $(SCANOBJ_DEPS) $(basefiles)
 	    $(srcdir)/gtkdoc-scangobj-transmitters			\
 		 --type-init-func="gst_init(NULL,NULL)"			\
 		 --types=farsight2-transmitters.types			\
-	        --module=$(DOC_MODULE) &&				\
+	         --module=$(DOC_MODULE) &&				\
 		$(PYTHON)						\
 		$(top_srcdir)/common/scangobj-merge.py $(DOC_MODULE);	\
 	fi
diff --git a/common/m4/Makefile.am b/common/m4/Makefile.am
new file mode 100644
index 0000000..4654387
--- /dev/null
+++ b/common/m4/Makefile.am
@@ -0,0 +1,40 @@
+EXTRA_DIST = \
+	as-ac-expand.m4 \
+	codeset.m4 \
+	gst-default.m4 \
+	gst.m4 \
+	inttypes.m4 \
+	progtest.m4 \
+	as-auto-alt.m4 \
+	gettext.m4 \
+	gst-doc.m4 \
+	gst-plugindir.m4 \
+	inttypes-pri.m4 \
+	stdint_h.m4 \
+	as-compiler-flag.m4 \
+	glibc21.m4 \
+	gst-error.m4 \
+	gst-plugin-docs.m4 \
+	isc-posix.m4 \
+	uintmax_t.m4 \
+	as-libtool.m4\
+	gst-arch.m4\
+	gst-feature.m4 \
+	gst-valgrind.m4 \
+	lcmessage.m4 \
+	ulonglong.m4 \
+	as-python.m4 \
+	gst-args.m4 \
+	gst-function.m4 \
+	iconv.m4 \
+	lib-ld.m4 \
+	as-scrub-include.m4 \
+	gst-check.m4 \
+	gst-gettext.m4 \
+	intdiv0.m4 \
+	lib-link.m4 \
+	as-version.m4 \
+	gst-debuginfo.m4 \
+	gst-glib2.m4 \
+	inttypes_h.m4 \
+	lib-prefix.m4
diff --git a/configure.ac b/configure.ac
index f13978f..aeb00fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -371,6 +371,8 @@ dnl *** output files ***
 AC_CONFIG_FILES(
 Makefile
 farsight2.pc
+common/Makefile
+common/m4/Makefile
 gst/Makefile
 gst/fsrtpconference/Makefile
 gst/funnel/Makefile
-- 
1.5.6.5




More information about the farsight-commits mailing list