From f306cb71606bc4d8e90efc84190967d9cf2b00a0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Tue, 26 Jun 2012 14:25:05 +0000
Subject: [PATCH] Simplified source tarball and packages distribution
 ("ETICS-less releases"): - list of the source files - using ${package} and
 ${version} in each module's Makefile - clean distribution files in 'clean' -
 update .PHONY targets - removed old dist, distsrc, and distbin targets

---
 org.glite.lbjp-common.db/Makefile                  | 18 ++++-------------
 org.glite.lbjp-common.gsoap-plugin/Makefile        | 14 ++++++++++++-
 .../project/glite-lbjp-common-gsoap-plugin.spec    |  4 ++--
 org.glite.lbjp-common.gss/Makefile                 | 14 ++++++++++++-
 .../project/glite-lbjp-common-gss.spec             |  4 ++--
 org.glite.lbjp-common.jp-interface/Makefile        |  7 ++++++-
 org.glite.lbjp-common.log/Makefile                 | 10 ++++++++++
 org.glite.lbjp-common.maildir/Makefile             |  5 ++++-
 org.glite.lbjp-common.server-bones/Makefile        | 10 ++++++++++
 org.glite.lbjp-common.trio/Makefile                | 23 ++++++++++------------
 10 files changed, 74 insertions(+), 35 deletions(-)

diff --git a/org.glite.lbjp-common.db/Makefile b/org.glite.lbjp-common.db/Makefile
index 1a2c20e..5023adf 100644
--- a/org.glite.lbjp-common.db/Makefile
+++ b/org.glite.lbjp-common.db/Makefile
@@ -24,6 +24,8 @@ CC=gcc
 
 VPATH=${top_srcdir}/interface:${top_srcdir}/src:${top_srcdir}/examples:${top_srcdir}/test
 
+SOURCES=doc/C.dox examples/*.c interface/*.h project/.post* src/*.c test/*.cpp LICENSE Makefile
+
 DEBUG:=-g -O0 -W -Wall
 
 CFLAGS:= ${CFLAGS} \
@@ -129,19 +131,6 @@ olddoc:
 stage: compile
 	$(MAKE) install PREFIX=${stagedir} DOSTAGE=yes
 
-dist: distsrc distbin
-
-distsrc:
-	mkdir -p ${top_srcdir}/${package}-${version}
-	cd ${top_srcdir} && GLOBIGNORE="${package}-${version}" && cp -Rf * ${package}-${version}
-	cd ${top_srcdir} && tar -czf ${distdir}/${package}-${version}_src.tar.gz --exclude-from=project/tar_exclude ${package}-${version}
-	rm -rf ${top_srcdir}/${package}-${version}
-
-distbin:
-	$(MAKE) install PREFIX=`pwd`/tmpbuilddir${stagedir}
-	save_dir=`pwd`; cd tmpbuilddir${stagedir}${prefix} && tar -czf $$save_dir/${top_srcdir}/${distdir}/${package}-${version}_bin.tar.gz *; cd $$save_dir
-	rm -rf tmpbuilddir
-        
 install: all
 	-mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}
 	-mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
@@ -154,6 +143,7 @@ install: all
 clean:
 	rm -rvf *.o *.lo *.loT .libs lib* *.c *.h *.dox C/ CPP/
 	rm -rvf db_expire db_test db_test_mysql db_test_psql timezone
+	rm -rvf dist ${package}-*.tar.gz
 
 distclean:
 	rm -rvf Makefile.inc *.spec debian/
@@ -182,4 +172,4 @@ db_test_mysql.lo: libglite_lbu_dbtest.la db.h db-int.h db_test.c
 db-mysql.lo: db-mysql.c db-int.h db.h
 db-pg.lo: db-pg.c db-int.h db.h
 
-.PHONY: default all compile check examples doc stage dist distsrc distbin install clean test_coverage distclean
+.PHONY: default all compile check examples doc stage dist distsrc distbin install clean test_coverage distclean dist distcheck
diff --git a/org.glite.lbjp-common.gsoap-plugin/Makefile b/org.glite.lbjp-common.gsoap-plugin/Makefile
index 4b8a036..87f357d 100644
--- a/org.glite.lbjp-common.gsoap-plugin/Makefile
+++ b/org.glite.lbjp-common.gsoap-plugin/Makefile
@@ -4,7 +4,7 @@ builddir=build
 top_builddir=${top_srcdir}/${builddir}
 stagedir=.
 globalprefix=glite
-package=gsoap-plugin
+package=glite-lbjp-common-gsoap-plugin
 version=1.0.0
 PREFIX=/opt/glite
 prefix=
@@ -15,6 +15,15 @@ gsoapxx_prefix?=${gsoap_prefix}
 
 CC=gcc
 
+SOURCES=\
+	examples/*.c examples/*.S \
+	interface/*.h interface/*.h.in \
+	project/.post* project/gsoap-plugin*.in project/libtoolhack/gcc \
+	src/*.c \
+	test/*.cpp \
+	LICENSE Makefile
+SOURCES_EXEC=project/libtoolhack/gcc
+
 gsoap_versions_flavours?=${gsoap_default_version}
 
 -include Makefile.inc
@@ -349,6 +358,7 @@ clean:
 		rm -rvf `echo $$v | tr -d .`; \
 	done
 	rm -fv ${PKG_CONFIG_FILES}
+	rm -rvf dist ${package}-*.tar.gz
 
 distclean:
 	rm -rvf Makefile.inc *.spec debian/
@@ -382,3 +392,5 @@ glite_gsplugin${langsuffix}.o glite_gsplugin${langsuffix}.thr.o: soap_version.h
 soap_version.h: stdsoap2.h
 	head stdsoap2.h | \
 	perl -ne '/^\s*stdsoap2.h\s+([0-9])\.([0-9])\.(\S+)\s.*/ && printf "#define GSOAP_VERSION %d%02d%02d\n#define GSOAP_MIN_VERSION \"$$3\"\n#ident \"soap_version.h $$1.$$2.$$3\"\n",$$1,$$2,$$3' >$@
+
+.PHONY: default all compile check check.cxx examples all-libs-with-soap libs-with-soap link-gsoap pkgconfig doc stage install install-soaplib clean distclean dist distcheck
diff --git a/org.glite.lbjp-common.gsoap-plugin/project/glite-lbjp-common-gsoap-plugin.spec b/org.glite.lbjp-common.gsoap-plugin/project/glite-lbjp-common-gsoap-plugin.spec
index 9642126..6e24219 100644
--- a/org.glite.lbjp-common.gsoap-plugin/project/glite-lbjp-common-gsoap-plugin.spec
+++ b/org.glite.lbjp-common.gsoap-plugin/project/glite-lbjp-common-gsoap-plugin.spec
@@ -78,8 +78,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%dir /usr/share/doc/gsoap-plugin-%{version}
-%doc /usr/share/doc/gsoap-plugin-%{version}/LICENSE
+%dir /usr/share/doc/%{name}-%{version}
+%doc /usr/share/doc/%{name}-%{version}/LICENSE
 /usr/%{_lib}/libglite_security_gsoap_plugin_*.so.9.@MINOR@.@REVISION@
 /usr/%{_lib}/libglite_security_gsoap_plugin_*.so.9
 
diff --git a/org.glite.lbjp-common.gss/Makefile b/org.glite.lbjp-common.gss/Makefile
index 6aac8c8..c8f08fa 100644
--- a/org.glite.lbjp-common.gss/Makefile
+++ b/org.glite.lbjp-common.gss/Makefile
@@ -4,7 +4,7 @@ builddir=build
 top_builddir=${top_srcdir}/${builddir}
 stagedir=.
 globalprefix=glite
-package=gss
+package=glite-lbjp-common-gss
 version=1.0.0
 PREFIX=/opt/glite
 prefix=
@@ -36,6 +36,15 @@ version_info:=-version-info ${shell \
 
 VPATH=${top_srcdir}/src:${top_srcdir}/test:${top_srcdir}/examples
 
+SOURCES=\
+	examples/*.c examples/*.h \
+	interface/*.h \
+	project/.post* \
+	project/doc/*.cls project/doc/*.pdf project/doc/*.tex project/doc/Makefile \
+	src/*.c \
+	test/*.cpp \
+	LICENSE Makefile
+
 default: all
 
 DEBUG:=-g -O0 -W -Wall -Wno-unused-parameter
@@ -191,6 +200,7 @@ install:
 
 clean:
 	rm -rf *.o *.lo *.a *.la .libs test_gss gss_server gss_client
+	rm -rvf dist ${package}-*.tar.gz
 
 distclean:
 	rm -rvf Makefile.inc *.spec debian/
@@ -203,3 +213,5 @@ distclean:
 
 test_gss.o: %.o: %.cpp
 	${CXX} -c ${CFLAGS} ${GLOBUS_GSSAPI_GSI_CFLAGS} ${CPPUNIT_CFLAGS} -Wno-error $<
+
+.PHONY: default all compile check check.gss test_coverage examples doc stage install clean distclean dist distcheck
diff --git a/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec b/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec
index b3200cd..d0fcaba 100644
--- a/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec
+++ b/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec
@@ -91,8 +91,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%dir /usr/share/doc/gss-%{version}
-%doc /usr/share/doc/gss-%{version}/LICENSE
+%dir /usr/share/doc/%{name}-%{version}
+%doc /usr/share/doc/%{name}-%{version}/LICENSE
 /usr/%{_lib}/libglite_security_gss.so.9.@MINOR@.@REVISION@
 /usr/%{_lib}/libglite_security_gss.so.9
 
diff --git a/org.glite.lbjp-common.jp-interface/Makefile b/org.glite.lbjp-common.jp-interface/Makefile
index 88de0d8..298487c 100644
--- a/org.glite.lbjp-common.jp-interface/Makefile
+++ b/org.glite.lbjp-common.jp-interface/Makefile
@@ -23,6 +23,8 @@ version=${module.version}
 
 VPATH=${top_srcdir}/src:${top_srcdir}/test:${top_srcdir}/project:${jpproject}
 
+SOURCES=interface/*.h project/.post* src/*.c test/*.cpp Makefile
+
 DEBUG:=-g -O0 -W -Wno-sign-compare
 CFLAGS:=${CFLAGS} ${DEBUG} -D_GNU_SOURCE -I. -I${top_srcdir}/interface -I${stagedir}${prefix}/include
 
@@ -104,6 +106,7 @@ clean:
 	rm -rvf *.o *.lo .libs lib*
 	rm -vf type_test type_test.xml
 	rm -f glite jp
+	rm -rvf dist ${package}-*.tar.gz
 
 distclean:
 	rm -rvf Makefile.inc *.spec debian/
@@ -112,4 +115,6 @@ distclean:
 	${COMPILE} -o $@ -c $<
 
 %.lo: %.c
-	${COMPILE} -o $@ -c $< 
+	${COMPILE} -o $@ -c $<
+
+.PHONY: default all compile check doc stage install clean distclean dist distcheck
diff --git a/org.glite.lbjp-common.log/Makefile b/org.glite.lbjp-common.log/Makefile
index d88d882..343eebb 100644
--- a/org.glite.lbjp-common.log/Makefile
+++ b/org.glite.lbjp-common.log/Makefile
@@ -20,6 +20,13 @@ version=${module.version}
 CC=gcc
 VPATH=${top_srcdir}/interface:${top_srcdir}/src:${top_srcdir}/tests
 
+SOURCES=\
+	config/log4crc* \
+	project/.post* \
+	src/*.c src/*.h \
+	tests/*.c tests/log4crc \
+	LICENSE Makefile README
+
 LOG4C_CFLAGS:=-I${log4c_prefix}/include
 LOG4C_LIBS:=-L${log4c_prefix}/${libdir} -L${log4c_prefix}/lib -llog4c
 
@@ -79,6 +86,7 @@ install: compile
 clean:
 	rm -rvf *.o *.lo .libs lib*
 	rm -rvf test
+	rm -rvf dist ${package}-*.tar.gz
 
 distclean:
 	rm -rvf Makefile.inc *.spec debian/
@@ -94,3 +102,5 @@ test: test.o
 
 %.o %.lo: %.c
 	${COMPILE} -c $<
+
+.PHONY: default all compile stage install check clean distclean dist distcheck
diff --git a/org.glite.lbjp-common.maildir/Makefile b/org.glite.lbjp-common.maildir/Makefile
index fbb913e..8770787 100644
--- a/org.glite.lbjp-common.maildir/Makefile
+++ b/org.glite.lbjp-common.maildir/Makefile
@@ -24,6 +24,8 @@ CC=gcc
 
 VPATH=${top_srcdir}/interface:${top_srcdir}/src:${top_srcdir}/examples
 
+SOURCES=interface/*.h project/.post* src/*.c Makefile
+
 DEBUG:=-g -O0 -W -Wall
 
 CFLAGS:= ${CFLAGS} \
@@ -93,6 +95,7 @@ install: all
 
 clean:
 	rm -rvf *.o *.lo .libs lib* *.c *.h *.dox C/ CPP/
+	rm -rvf dist ${package}-*.tar.gz
 
 distclean:
 	rm -rvf Makefile.inc *.spec debian/
@@ -102,4 +105,4 @@ distclean:
 
 maildir.lo: maildir.c maildir.h
 
-.PHONY: default all compile check examples doc stage dist distsrc distbin install clean distclean test_coverage
+.PHONY: default all compile check examples doc stage dist distsrc distbin install clean distclean test_coverage dist distcheck
diff --git a/org.glite.lbjp-common.server-bones/Makefile b/org.glite.lbjp-common.server-bones/Makefile
index 744b7cc..16ba9d3 100644
--- a/org.glite.lbjp-common.server-bones/Makefile
+++ b/org.glite.lbjp-common.server-bones/Makefile
@@ -17,6 +17,13 @@ version=${module.version}
 
 VPATH=${top_srcdir}/src:${top_srcdir}/examples
 
+SOURCES=\
+	examples/*.c examples/*.sh \
+	interface/*.h \
+	project/.post* \
+	src/*.c \
+	Makefile
+
 DEBUG:=-g -O0 -Wall
 CFLAGS:=${DEBUG} \
 	-I${top_srcdir}/interface \
@@ -92,9 +99,12 @@ install:
 
 clean:
 	rm -rvf *.o *.lo .libs lib* srv_example cnt_example
+	rm -rvf dist ${package}-*.tar.gz
 
 distclean:
 	rm -rvf Makefile.inc *.spec debian/
 
 %.o %.lo: %.c
 	${COMPILE} -c $<
+
+.PHONY: default all compile stage check example doc install clean distclean dist distcheck
diff --git a/org.glite.lbjp-common.trio/Makefile b/org.glite.lbjp-common.trio/Makefile
index b703d3f..984d7a1 100644
--- a/org.glite.lbjp-common.trio/Makefile
+++ b/org.glite.lbjp-common.trio/Makefile
@@ -29,6 +29,13 @@ LINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS}
 LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} 
 INSTALL:=libtool --mode=install install
 
+SOURCES=\
+	interface/*.h \
+	project/.post* \
+	src/*.c src/*.h \
+	test/*.cpp \
+	LICENSE Makefile
+
 os=${shell uname}
 DL_LIBS:=
 ifeq (${os},Linux)
@@ -90,19 +97,6 @@ trio_test: trio_test.cpp
 	${CXX} -c ${CFLAGS} ${TEST_INC} $<
 	${LINKXX} -o $@ trio_test.o ${LTLIB} ${TEST_LIBS}
 
-dist: distsrc distbin
-
-distsrc:
-	mkdir -p ${top_srcdir}/${package}-${version}
-	cd ${top_srcdir} && GLOBIGNORE="${package}-${version}" && cp -Rf * ${package}-${version}
-	cd ${top_srcdir} && tar -czf ${distdir}/${package}-${version}_src.tar.gz --exclude-from=project/tar_exclude ${package}-${version}
-	rm -rf ${top_srcdir}/${package}-${version}
-
-distbin:
-	$(MAKE) install PREFIX=`pwd`/tmpbuilddir${stagedir}
-	save_dir=`pwd`; cd tmpbuilddir${stagedir} && tar -czf $$save_dir/${top_srcdir}/${distdir}/${package}-${version}_bin.tar.gz *; cd $$save_dir
-	rm -rf tmpbuilddir
-
 install: all
 	-mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}
 	-mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
@@ -116,9 +110,12 @@ install: all
 clean:
 	rm -rvf *.o *.lo .libs lib* *.c *.h *.dox C/ CPP/
 	rm -vf trio_test
+	rm -rvf dist ${package}-*.tar.gz
 	
 distclean:
 	rm -rvf Makefile.inc *.spec debian/
 
 %.lo %.o: %.c
 	${COMPILE} ${CFLAGS} -c $<
+
+.PHONY: default all compile stage check mkreports runtest install clean distclean dist distcheck
-- 
1.8.2.3