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

diff --git a/emi.canl.canl-c/Makefile b/emi.canl.canl-c/Makefile
index ceaf85e..b0007a9 100644 (file)
--- a/emi.canl.canl-c/Makefile
+++ b/emi.canl.canl-c/Makefile
@@ -1,5 +1,6 @@
 top_srcdir=.
 stagedir=$(shell pwd)
+package=canl-c
 PREFIX=
 prefix=/usr
 libdir=lib
@@ -7,6 +8,8 @@ libdir=lib
 -include Makefile.inc
 -include ${top_srcdir}/project/version.properties
 
+version=${module.version}
+
 VPATH=${top_srcdir}/src/:${top_srcdir}/src/proxy/:${top_srcdir}/examples:${top_srcdir}/doc/src
 KPATH = TEXINPUTS=".:${top_srcdir}/doc/src//:"
 KPATHBIB = BIBINPUTS=".:$(VPATH)//:"
@@ -23,6 +26,14 @@ COMPILE=libtool --mode=compile ${CC} ${CFLAGS}
 LINK=libtool --mode=link ${CC} ${LDFLAGS}
 INSTALL=libtool --mode=install install
 
+SOURCES=\
+       doc/src/*.cls doc/src/*.tex doc/src/images/*.pdf \
+       examples/*.c \
+       src/canl_error_* src/*.c src/*.h src/*.pl \
+       src/proxy/*.c src/proxy/*.h src/proxy/*.in src/proxy/*.y src/proxy/*.l \
+       Makefile
+SOURCES_EXEC=src/*.pl
+
 CFLAGS_LIB=-fPIC -I${top_srcdir}/src ${LIBCARES_CFLAGS} ${LIBSSL_CFLAGS} -I.
 LFLAGS_LIB=-shared ${LIBCARES_LIBS} ${LIBSSL_LIBS}
 
@@ -70,9 +81,9 @@ LIBCANL=libcanl_c.la
 #
 offset=0
 version_info:=-version-info ${shell \
-       perl -e '$$,=":"; @F=split "\\.","${module.version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' }
+       perl -e '$$,=":"; @F=split "\\.","${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' }
 major:=${shell \
-       perl -e '$$,=":"; @F=split "\\.","${module.version}"; print $$F[0]+$$F[1]+${offset}' }
+       perl -e '$$,=":"; @F=split "\\.","${version}"; print $$F[0]+$$F[1]+${offset}' }
 
 all: ${LIBCANL} server client proxy delegation doc
 
@@ -138,7 +149,7 @@ canl_err_desc.c: canl_error_codes canl_error_desc
        ${top_srcdir}/src/gen_err_desc.pl $^ > $@
 
 ver.tex:
-       printf "\134def\134version{${module.version}}\n" > ver.tex
+       printf "\134def\134version{${version}}\n" > ver.tex
 
 check:
 
@@ -146,7 +157,7 @@ install: all
        mkdir -p ${DESTDIR}${PREFIX}${prefix}/bin
        mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}
        mkdir -p ${DESTDIR}${PREFIX}${prefix}/include
-       mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/canl-c-${module.version}
+       mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/canl-c-${version}
        ${INSTALL} -m 755 server ${DESTDIR}${PREFIX}${prefix}/bin/emi-canl-server
        ${INSTALL} -m 755 client ${DESTDIR}${PREFIX}${prefix}/bin/emi-canl-client
        ${INSTALL} -m 755 proxy \
@@ -157,7 +168,7 @@ install: all
        ${INSTALL} -m 644 ${top_srcdir}/src/canl.h \
                ${top_srcdir}/src/canl_ssl.h canl_err.h \
                ${DESTDIR}${PREFIX}${prefix}/include
-       ${INSTALL} -m 644 canl.pdf ${DESTDIR}${PREFIX}${prefix}/share/doc/canl-c-${module.version}
+       ${INSTALL} -m 644 canl.pdf ${DESTDIR}${PREFIX}${prefix}/share/doc/canl-c-${version}
 
 stage: all
        $(MAKE) install PREFIX=${stagedir}
@@ -167,6 +178,9 @@ clean:
                *.c *.h lex.backup stage \
                canl.aux canl.log canl.pdf canl.out canl.toc ver.tex \
                canl.bbl canl.blg
+       rm -rvf dist ${package}-*.tar.gz
 
 distclean:
        rm -rvf Makefile.inc config.status project/changelog *.spec debian/
+
+.PHONY: all doc check install stage clean distclean dist distcheck

diff --git a/org.glite.jobid.api-c/Makefile b/org.glite.jobid.api-c/Makefile
index 8c1cbde..de83c4e 100644 (file)
--- a/org.glite.jobid.api-c/Makefile
+++ b/org.glite.jobid.api-c/Makefile
@@ -29,6 +29,8 @@ LINK:=libtool --mode=link ${CC} ${LDFLAGS}
 LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS}
 INSTALL:=libtool --mode=install install
 
+SOURCES=interface/*.h src/*.c src/*.h project/.post* test/*.cpp Makefile
+
 LIBOBJS:=cjobid.o strmd5.o 
 HDRS:=cjobid.h strmd5.h
 
@@ -73,6 +75,7 @@ base64_test: %: %.cpp compile
 clean:
        rm -rvf *.o *.lo .libs/ lib* *.c *.cpp *.h
        rm -vf base64_test base64_test.xml
+       rm -rvf dist ${package}-*.tar.gz
 
 distclean:
        rm -rvf Makefile.inc *.spec debian/
@@ -90,5 +93,4 @@ install: ${LIB}
 %.lo %.o: %.c
        ${COMPILE} -o $@ -c $< 
 
-
-.PHONY: default all compile check stage install clean distclean
+.PHONY: default all compile check stage install clean distclean dist distcheck

diff --git a/org.glite.jobid.api-cpp/Makefile b/org.glite.jobid.api-cpp/Makefile
index 7586462..d92167d 100644 (file)
--- a/org.glite.jobid.api-cpp/Makefile
+++ b/org.glite.jobid.api-cpp/Makefile
@@ -10,6 +10,7 @@ CC:=gcc
 CXX:=g++
 
 -include Makefile.inc
+-include ${top_srcdir}/project/version.properties
 
 version=${module.version}
 
@@ -28,6 +29,8 @@ LINK:=libtool --mode=link ${CC} ${LDFLAGS}
 LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS}
 INSTALL:=libtool --mode=install install
 
+SOURCES=interface/*.h Makefile
+
 LIBOBJS:=
 HDRS:=JobId.h
 
@@ -43,6 +46,7 @@ check: compile
 
 clean:
        rm -rvf *.o *.lo .libs lib* *.c *.cpp *.h
+       rm -rvf dist ${package}-*.tar.gz
 
 distclean:
        rm -rvf Makefile.inc *.spec debian/
@@ -57,5 +61,4 @@ stage:
 %.o: %.c
        ${COMPILE} -o $@ -c $< 
 
-
-.PHONY: default all compile check install clean distclean
+.PHONY: default all compile check install clean distclean dist distcheck

diff --git a/org.glite.jobid.api-java/Makefile b/org.glite.jobid.api-java/Makefile
index 9f11d6b..66e32c3 100644 (file)
--- a/org.glite.jobid.api-java/Makefile
+++ b/org.glite.jobid.api-java/Makefile
@@ -1,10 +1,20 @@
 top_srcdir=.
 stagedir=../stage
+package=glite-jobid-api-java
 
 -include Makefile.inc
+-include ${top_srcdir}/project/version.properties
+
+version=${module.version}
 
 ANT_ARGS=-f ${top_srcdir}/build.xml -Dfile.reference.commons-codec.jar=${jakarta-commons-codec_jar} -Dsrc.dir=${top_srcdir}/src -Dbuild.dir=$(shell pwd)/build -Ddist.dir=$(shell pwd)/dist
 
+SOURCES=\
+       build.xml Makefile \
+       nbproject/*.properties nbproject/*.xml \
+       nbproject/private/*.properties nbproject/private/*.xml \
+       src/org/glite/jobid/*.java
+
 all compile:
        ${ant_prefix}/bin/ant ${ANT_ARGS}
 
@@ -19,8 +29,9 @@ check:
 
 clean:
        ${ant_prefix}/bin/ant ${ANT_ARGS} clean
+       rm -rvf dist ${package}-*.tar.gz
 
 distclean:
        rm -rvf Makefile.inc *.spec debian/
 
-.PHONY: all compile stage install check clean distclean
+.PHONY: all compile stage install check clean distclean dist distcheck