From c24f0d24363da4dbf5d3ac9906c7e8e1503c2ab9 Mon Sep 17 00:00:00 2001
From: Olaf Bergmann <obgm@users.sourceforge.net>
Date: Mon, 18 Oct 2010 17:20:05 +0200
Subject: [PATCH] fixed target dist

---
 Makefile.in          | 16 +++++++++-------
 doc/Makefile.in      |  9 +++++----
 examples/Makefile.in |  9 +++++----
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 79fbe1ea..1f263210 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,6 +26,7 @@ MKDIR = mkdir
 
 abs_builddir = @abs_builddir@
 top_builddir = @top_builddir@
+package = @PACKAGE_TARNAME@-@PACKAGE_VERSION@
 
 # files and flags
 SOURCES:= pdu.c net.c debug.c encode.c uri.c list.c subscribe.c str.c
@@ -33,9 +34,9 @@ OBJECTS:= $(patsubst %.c, %.o, $(SOURCES))
 HEADERS:=coap.h config.h debug.h pdu.h net.h encode.h uri.h list.h mem.h subscribe.h str.h 
 #CFLAGS:=-g -Wall -ansi -pedantic
 CFLAGS:=-Wall -ansi -pedantic @CFLAGS@
-DISTDIR=$(abs_builddir)/@PACKAGE_TARNAME@-@PACKAGE_VERSION@
-SUBDIRS:=examples
-FILES:=Makefile $(SOURCES) $(HEADERS)
+DISTDIR=$(top_builddir)/$(package)
+SUBDIRS:=examples doc
+FILES:=Makefile.in configure configure.in config.h.in $(SOURCES) $(HEADERS)
 LIB:=libcoap.a
 LDFLAGS:=@LIBS@
 ARFLAGS:=cru
@@ -77,12 +78,13 @@ distclean:	clean
 	@rm -rf $(DISTDIR)
 	@rm -f *~ $(DISTDIR).tar.gz
 
-dist:
+dist:	$(FILES) $(SUBDIRS)
 	test -d $(DISTDIR) || mkdir $(DISTDIR)
-	test -d $(DISTDIR)/$(examples) || mkdir $(DISTDIR)/$(examples)
 	cp $(FILES) $(DISTDIR)
-	$(MAKE) -C $(examples) dist DISTDIR=../$(DISTDIR)/$(examples)
-	tar czf $(DISTDIR).tar.gz $(DISTDIR)
+	for dir in $(SUBDIRS); do \
+		$(MAKE) -C $$dir dist; \
+	done
+	tar czf $(package).tar.gz $(DISTDIR)
 
 .gitignore:
 	echo "core\n*~\n*.[oa]\n*.gz\n*.cap\n$(PROGRAM)\n$(DISTDIR)\n.gitignore" >$@
diff --git a/doc/Makefile.in b/doc/Makefile.in
index ca6ea598..50ac7ec4 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -25,10 +25,10 @@ SHELL = /bin/sh
 MKDIR = mkdir
 DOXYGEN= @DOXYGEN@
 
-abs_builddir = @abs_builddir@
+top_builddir = @top_builddir@
 
-DISTDIR?=$(abs_builddir)/@PACKAGE_TARNAME@-@PACKAGE_VERSION@
-FILES:=Makefile html
+DISTDIR?=$(top_builddir)/@PACKAGE_TARNAME@-@PACKAGE_VERSION@
+FILES:=Makefile.in Doxyfile.in html
 
 doc:	Doxyfile
 	$(DOXYGEN) >./doxygen.out 2>&1 
@@ -41,4 +41,5 @@ distclean:	clean
 	@rm -f *~ 
 
 dist:	doc
-	cp -r $(FILES) $(DISTDIR)
+	test -d $(DISTDIR)/doc || mkdir $(DISTDIR)/doc
+	cp -r $(FILES) $(DISTDIR)/doc
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 5b605bc0..f515fc8e 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -34,8 +34,8 @@ SOURCES:= tiny.c client.c server.c
 OBJECTS:= $(patsubst %.c, %.o, $(SOURCES))
 #CFLAGS:=-g -Wall -ansi -pedantic -I..
 CFLAGS:=-g -Wall -I$(top_srcdir) @CFLAGS@
-DISTDIR?=$(abs_builddir)/@PACKAGE_TARNAME@-@PACKAGE_VERSION@
-FILES:=Makefile $(SOURCES)
+DISTDIR?=$(top_builddir)/@PACKAGE_TARNAME@-@PACKAGE_VERSION@
+FILES:=Makefile.in $(SOURCES)
 LDFLAGS:=-L$(top_builddir) -lcoap @LIBS@
 
 .PHONY: clean distclean
@@ -65,5 +65,6 @@ distclean:	clean
 	@rm -rf $(DISTDIR)
 	@rm -f *~ 
 
-dist:
-	cp $(FILES) $(DISTDIR)
+dist:	$(FILES)
+	test -d $(DISTDIR)/examples || mkdir $(DISTDIR)/examples
+	cp $(FILES) $(DISTDIR)/examples