From 0d5c4fa26544d38036fed04e683e170004e542ca Mon Sep 17 00:00:00 2001
From: Christian Thaeter <ct@pipapo.org>
Date: Fri, 20 Apr 2007 05:21:34 +0200
Subject: [PATCH] included image and m4 dirs

---
 Makefile.am       |  9 ++++-----
 configure.ac      |  4 +---
 image/Makefile.am | 10 ++++++----
 m4/Makefile.am    | 27 ++++++++++++++++++++++++---
 4 files changed, 35 insertions(+), 15 deletions(-)
 rewrite m4/Makefile.am (100%)

diff --git a/Makefile.am b/Makefile.am
index 70411095..31894d47 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,17 +10,16 @@ noinst_HEADERS =
 EXTRA_DIST =
 SUBDIRS =
 
+SUBDIRS += mpeg2enc toolame-02l po
+
 include $(top_srcdir)/libmpeg3/Makefile.am
 include $(top_srcdir)/quicktime/Makefile.am
-
-SUBDIRS += mpeg2enc toolame-02l
-
 include $(top_srcdir)/guicast/Makefile.am
 include $(top_srcdir)/cinelerra/Makefile.am
 include $(top_srcdir)/mplexlo/Makefile.am
 include $(top_srcdir)/plugins/Makefile.am
-
-SUBDIRS += po image m4
+include $(top_srcdir)/image/Makefile.am
+include $(top_srcdir)/m4/Makefile.am
 
 EXTRA_DIST += admin debian doc depcomp README.BUILD LICENSE \
 	cinelerra-cvs-current.spec
diff --git a/configure.ac b/configure.ac
index 8c3dd1ab..e2342226 100644
--- a/configure.ac
+++ b/configure.ac
@@ -480,13 +480,11 @@ AC_SUBST(OBJCOPYARCH, $ocarch)
 
 
 AC_OUTPUT(Makefile cinelerra-cvs-current.spec po/Makefile.in \
-	m4/Makefile \
 	quicktime/ffmpeg/Makefile \
 	quicktime/ffmpeg/libavcodec/Makefile \
 	quicktime/ffmpeg/libavcodec/i386/Makefile \
 	quicktime/ffmpeg/libavcodec/ppc/Makefile \
-					mpeg2enc/Makefile toolame-02l/Makefile \
-					image/Makefile)
+        mpeg2enc/Makefile toolame-02l/Makefile)
 
 succeeded=yes
 AC_DEFUN([RPT],[if test "x$$1" = "xyes"; then status=found; else status=missing; succeeded=no; fi
diff --git a/image/Makefile.am b/image/Makefile.am
index bc46c0b1..ec159b5f 100644
--- a/image/Makefile.am
+++ b/image/Makefile.am
@@ -1,8 +1,10 @@
+image_srcdir = $(top_srcdir)/image
+
 desktopdir = $(datadir)/applications
-desktop_DATA = cinelerra.desktop
+desktop_DATA = $(image_srcdir)/cinelerra.desktop
 
 pixmapdir = $(datadir)/pixmaps
-pixmap_DATA = cinelerra.xpm
+pixmap_DATA = $(image_srcdir)/cinelerra.xpm
 
-EXTRA_DIST = \
-        cinelerra.desktop cinelerra.xpm
+EXTRA_DIST += \
+        $(image_srcdir)/cinelerra.desktop $(image_srcdir)/cinelerra.xpm
diff --git a/m4/Makefile.am b/m4/Makefile.am
dissimilarity index 100%
index 16d13904..f940eec6 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,3 +1,24 @@
-EXTRA_DIST = \
-	alsa.m4 esd.m4 \
-codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4
+m4_srcdir = $(top_srcdir)/m4
+
+EXTRA_DIST += \
+	$(m4_srcdir)/alsa.m4 \
+	$(m4_srcdir)/esd.m4 \
+	$(m4_srcdir)/codeset.m4 \
+	$(m4_srcdir)/gettext.m4 \
+	$(m4_srcdir)/glibc21.m4 \
+	$(m4_srcdir)/iconv.m4 \
+	$(m4_srcdir)/intdiv0.m4 \
+	$(m4_srcdir)/inttypes.m4 \
+	$(m4_srcdir)/inttypes_h.m4 \
+	$(m4_srcdir)/inttypes-pri.m4 \
+	$(m4_srcdir)/isc-posix.m4 \
+	$(m4_srcdir)/lcmessage.m4 \
+	$(m4_srcdir)/lib-ld.m4 \
+	$(m4_srcdir)/lib-link.m4 \
+	$(m4_srcdir)/lib-prefix.m4 \
+	$(m4_srcdir)/nls.m4 \
+	$(m4_srcdir)/po.m4 \
+	$(m4_srcdir)/progtest.m4 \
+	$(m4_srcdir)/stdint_h.m4 \
+	$(m4_srcdir)/uintmax_t.m4 \
+	$(m4_srcdir)/ulonglong.m4
-- 
2.11.4.GIT