Added DISTCLEANFILES to make "make distclean" work better

git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1739 9efc2488-bf62-4759-914b-345cdb29e865

diff --git a/src/Makefile.am b/src/Makefile.am
index d695ad0..d9389d5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,6 +21,7 @@ jsdir = $(LIBDIR)/javascript
 export OSRF_JAVA_DEPSDIR = @OSRF_JAVA_DEPSDIR@
 etcdir = $(ETCDIR)
 
+DISTCLEANFILES = Makefile.in Makefile
 
 AM_LDFLAGS = $(DEF_LDFLAGS)
 AM_CFLAGS = $(DEF_CFLAGS)

diff --git a/src/c-apps/Makefile.am b/src/c-apps/Makefile.am
index 80e0e3d..49c3d20 100644 (file)
--- a/src/c-apps/Makefile.am
+++ b/src/c-apps/Makefile.am
@@ -15,6 +15,8 @@
 AM_CFLAGS = $(DEF_CFLAGS) -DORSF_LOG_PARAMS 
 AM_LDFLAGS = $(DEF_LDFLAGS) -L@top_builddir@/src/libopensrf
 
+DISTCLEANFILES = Makefile.in Makefile
+
 noinst_PROGRAMS = timejson
 lib_LTLIBRARIES = osrf_dbmath.la osrf_math.la osrf_version.la
 

diff --git a/src/gateway/Makefile.am b/src/gateway/Makefile.am
index 3fba17c..c069be0 100644 (file)
--- a/src/gateway/Makefile.am
+++ b/src/gateway/Makefile.am
@@ -17,6 +17,8 @@ EXTRA_DIST = @srcdir@/apachetools.c @srcdir@/apachetools.h @srcdir@/osrf_json_ga
 AM_CFLAGS = -D_LARGEFILE64_SOURCE -Wall -I@abs_top_srcdir@/include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS)
 AM_LDFLAGS = -L$(LIBDIR) -L@top_builddir@/src/libopensrf
 
+DISTCLEANFILES = Makefile.in Makefile
+
 install-exec-local: 
        if [ ! "$$(grep mod_placeholder `apxs2 -q SYSCONFDIR`/httpd.conf)" ]; \
                then echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \

diff --git a/src/java/Makefile.am b/src/java/Makefile.am
index 07d5fa1..fca8600 100644 (file)
--- a/src/java/Makefile.am
+++ b/src/java/Makefile.am
@@ -1,3 +1,5 @@
+DISTCLEANFILES = Makefile.in Makefile
+
 JAVAC=javac -J-Xmx256m
 JAVA=java -Xmx256m 
 JAVA_LIBDIR = .lib
@@ -53,5 +55,3 @@ install-data-local:
 
 dep_clean:
        rm -rf deps
-
-       

diff --git a/src/jserver/Makefile.am b/src/jserver/Makefile.am
index 03eab79..93cc243 100644 (file)
--- a/src/jserver/Makefile.am
+++ b/src/jserver/Makefile.am
@@ -16,6 +16,8 @@ LDADD = -lxml2 $(DEF_LDLIBS)
 AM_CFLAGS = $(DEF_CFLAGS) -D_GNU_SOURCE -L@top_builddir@/src/libopensrf
 AM_LDFLAGS = $(DEF_LDFLAGS)
 
+DISTCLEANFILES = Makefile.in Makefile
+
 bin_PROGRAMS = chopchop
 chopchop_SOURCES = osrf_chat.c osrf_chat.h osrf_chat_main.c
 

diff --git a/src/libopensrf/Makefile.am b/src/libopensrf/Makefile.am
index 479e3dc..6c8c723 100644 (file)
--- a/src/libopensrf/Makefile.am
+++ b/src/libopensrf/Makefile.am
@@ -16,6 +16,8 @@ AM_CFLAGS = $(DEF_CFLAGS) -DASSUME_STATELESS  -DOSRF_STRICT_PARAMS -rdynamic -fn
 AM_LDFLAGS = $(DEF_LDFLAGS) -R $(libdir)
 LDADD = -lxml2 -ldl -lmemcache -lopensrf
 
+DISTCLEANFILES = Makefile.in Makefile
+
 OSRF_INC = @top_srcdir@/include/opensrf
 
 TARGS =                osrf_message.c \

diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am
index 8c80206..cd7b88b 100644 (file)
--- a/src/perl/Makefile.am
+++ b/src/perl/Makefile.am
@@ -11,6 +11,8 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
+DISTCLEANFILES = Makefile.in Makefile
+
 all:
        perl Build.PL || make -s install-perl-fail
 
@@ -22,3 +24,7 @@ install-perl-fail:
        echo ">>> See the messages above this one for more information."
        echo
        exit 1
+
+distclean-local:
+       rm -rf ./_build
+       rm -rf ./blib
\ No newline at end of file

diff --git a/src/python/Makefile.am b/src/python/Makefile.am
index 6225f27..80c4904 100644 (file)
--- a/src/python/Makefile.am
+++ b/src/python/Makefile.am
@@ -1,5 +1,7 @@
 # makefile for OpenSRF Python modules and scripts
 
+DISTCLEANFILES = Makefile.in Makefile
+
 all-local:
        @echo $@
        python @srcdir@/setup.py build
@@ -12,11 +14,11 @@ install-data-local:
        python @srcdir@/setup.py install
 
 distclean-local:
-       rm @builddir@/OpenSRF.egg-info/PKG-INFO
-       rm @builddir@/OpenSRF.egg-info/requires.txt
-       rm @builddir@/OpenSRF.egg-info/top_level.txt
-       rm @builddir@/OpenSRF.egg-info/SOURCES.txt
-       rm @builddir@/OpenSRF.egg-info/dependency_links.txt
-       rm @builddir@/build/scripts-2.5/srfsh.py
-       rm @builddir@/dist/OpenSRF-1.0.0-py2.5.egg
+       rm -f @builddir@/OpenSRF.egg-info/PKG-INFO
+       rm -f @builddir@/OpenSRF.egg-info/requires.txt
+       rm -f @builddir@/OpenSRF.egg-info/top_level.txt
+       rm -f @builddir@/OpenSRF.egg-info/SOURCES.txt
+       rm -f @builddir@/OpenSRF.egg-info/dependency_links.txt
+       rm -f @builddir@/build/scripts-2.5/srfsh.py
+       rm -f @builddir@/dist/OpenSRF-1.0.0-py2.5.egg
 

diff --git a/src/router/Makefile.am b/src/router/Makefile.am
index d777f3b..9c88b33 100644 (file)
--- a/src/router/Makefile.am
+++ b/src/router/Makefile.am
@@ -16,6 +16,8 @@ LDADD = -lxml2 $(DEF_LDLIBS)
 AM_CFLAGS = $(DEF_CFLAGS) -D_ROUTER -L@top_builddir@/src/libopensrf
 AM_LDFLAGS = $(DEF_LDFLAGS)
 
+DISTCLEANFILES = Makefile.in Makefile
+
 bin_PROGRAMS = opensrf_router
 opensrf_router_SOURCES = osrf_router.c osrf_router_main.c osrf_router.h 
 

diff --git a/src/srfsh/Makefile.am b/src/srfsh/Makefile.am
index 5c9f451..be0f897 100644 (file)
--- a/src/srfsh/Makefile.am
+++ b/src/srfsh/Makefile.am
@@ -16,5 +16,7 @@ LDADD = -lreadline -lxml2 -lncurses $(DEF_LDLIBS)
 AM_CFLAGS = $(DEF_CFLAGS) -DEXEC_DEFAULT -L@top_builddir@/src/libopensrf
 AM_LDFLAGS = $(DEF_LDFLAGS)
 
+DISTCLEANFILES = Makefile.in Makefile
+
 bin_PROGRAMS = srfsh
 srfsh_SOURCES = srfsh.c