From 12c6f7956e596bd0ef76058788f0de6fb0d7119b Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Wed, 18 Jul 2001 14:05:11 +0000
Subject: [PATCH] defs-orig.mk, rules.mk: Cleanup commit

---
 make/defs-orig.mk | 31 +++++++++++++++++++++++++++++--
 make/rules.mk     |  7 +++++--
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/make/defs-orig.mk b/make/defs-orig.mk
index 6ae65e06..e7f9fd9c 100644
--- a/make/defs-orig.mk
+++ b/make/defs-orig.mk
@@ -3,7 +3,15 @@
 # contact@jannet.de
 # $Id$
 
-VERSION     = $(shell cat $(TOPDIR)/VERSION)
+VERSION                = $(shell cat $(TOPDIR)/VERSION)
+WINVERSION             = $(shell cat $(TOPDIR)/VERSION | sed -e "s/\./_/g")
+LOCAL_VERSION          = $(shell cat VERSION)
+LOCAL_WINVERSION       = $(shell cat VERSION | sed -e "s/\./_/g")
+DIST_VERSION           = $(shell echo $(VERSION) | sed -e "s/-dev//")
+DIST_WINVERSION        = $(shell echo $(WINVERSION) | sed -e "s/-dev//")
+LOCAL_DIST_VERSION     = $(shell echo $(LOCAL_VERSION) | sed -e "s/-dev//")
+LOCAL_DIST_WINVERSION  = $(shell echo $(LOCAL_WINVERSION) | sed -e "s/-dev//")
+
 PROJECT     = mod
 MOD         = mod
 LIBNAME     = $(MOD)
@@ -15,7 +23,26 @@ SHOBJS      = $(patsubst %.cpp,%.o,$(patsubst %.cc,lib%.so,$(patsubst %.c,lib%.s
 SHSCRIPTS   = $(patsubst %.sh.tmpl,%.sh,$(wildcard *.sh.tmpl))
 SCRIPTS     = $(patsubst %.tmpl,%,$(wildcard *.tmpl))
 INST_HDRS   = $(patsubst %.h,$(TOPDIR)/include/%.h,$(wildcard *.h))
-PREREQ_DONE = $(patsubst %,$(TOPDIR)/%/all.done,$(LOCAL_PREREQ))
+
+LOCAL_H     = $(wildcard *.h)
+LOCAL_C     = $(wildcard *.c)
+LOCAL_CPP   = $(wildcard *.c *.cpp *.cc *.C)
+LOCAL_CSRC  = $(LOCAL_H) $(LOCAL_C) $(LOCAL_CPP)
+
+PREREQ_DIR  = $(patsubst %,$(TOPDIR)/%,$(LOCAL_PREREQ))
+PREREQ_DONE = $(patsubst %,%/all.done,$(PREREQ_DIR))
+PREREQ_H    = $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.h))  
+PREREQ_C    = $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.c)) 
+PREREQ_CPP  = $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.c)) \
+              $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.cpp)) 
+PREREQ_CSRC = $(PREREQ_H) $(PREREQ_C) $(PREREQ_CPP)
+
+ALL_H       = $(LOCAL_H) $(PREREQ_H)
+ALL_C       = $(LOCAL_C) $(PREREQ_CPP)
+ALL_CPP     = $(LOCAL_CPP) $(PREREQ_CPP)
+
+ALL_CSRC    = $(LOCAL_CSRC) $(PREREQ_CSRC)
+
 TEXTCLEAN   = $(wildcard *~ .*~ .*.swp \#*\#)
 INCLUDE     = -I$(TOPDIR)/include
 LIBDIR      = $(TOPDIR)/lib
diff --git a/make/rules.mk b/make/rules.mk
index 1b917a00..bbac373b 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -50,6 +50,9 @@ installso: $(ALL) checkroot
 installsh: $(ALL)
 	$(INSTALL) $(SHSCRIPTS) $(PREFIX)/bin/
 
+pckgclean:
+	rm -rf *.zip *.tar.gz *.rpm *.deb
+
 tmpclean:
 	rm -rf *.tmp *.rep
 
@@ -69,11 +72,11 @@ execlean: allclean objclean textclean
 
 distclean: clean objclean textclean tmpclean vcdistclean
 
-localclean:
+localclean: $(LOCAL_CLEAN)
 	rm -rf $(CLEAN)
 
 libclean:
 	rm -rf $(LIB)
 
 vcdistclean:
-	rm -rf *.plg *.opt *.ncb Debug
+	rm -rf *.plg *.opt *.ncb Debug *.exe dist *.ilk