make: Add support for make.mk

make/Makefile

@@ -4,4 +4,4 @@
 # $Id$
 
 MODDIR = ..
-include $(MODDIR)/make/text.mk
+include $(MODDIR)/make/make.mk

make/defs-orig.mk

@@ -60,6 +60,7 @@ GCC_REV     = $(shell  gcc -v 2>&1 | grep version | awk '{ split($$3,a,"."); pri
 CPP = g++
 
 EXE_SH      = $(wildcard *.sh)
+MKFILES     = $(wildcard *.mk)
 
 CFILES      = $(wildcard *.c)
 CPPFILES    = $(wildcard *.cc *.cpp)
@@ -104,6 +105,7 @@ TEXTCLEAN   = $(wildcard *~ .*~ .*.swp *.rep)
 INCLUDE     = -I. -I$(TOPDIR)/include -I$(MODDIR)/include $(PROJECT_INCLUDE) $(LOCAL_INCLUDE)
 INSTALL_LIBDIR = $(PREFIX)/lib
 INSTALL_HDRDIR = $(PREFIX)/include
+INSTALL_MKDIR  = $(PREFIX)/make
 INSTALL_BINDIR = $(PREFIX)/bin
 INSTALL_DOCDIR_DIST = $(DOC_PREFIX)
 INSTALL_DOCDIR_DEVEL = $(DOC_PREFIX)-devel
@@ -123,6 +125,7 @@ INSTALLED_LIB_A  = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
 
 INSTALLED_EXE    = $(INSTALL_BINDIR)/$(EXE)
 INSTALLED_EXE_SH = $(addprefix $(INSTALL_BINDIR)/,$(EXE_SH))
+INSTALLED_MKFILES = $(addprefix $(INSTALL_MKDIR)/,$(MKFILES))
 
 MEMBERS     = $(LIB_A)($(OBJ))
 #PREFIX      = ../# CAUTION: This breaks the installation in the project

make/make.mk

@@ -0,0 +1,12 @@
+# generic utility modules
+# (c) 2001 jannet it services
+# contact@jannet.de
+# $Id$
+
+include $(MODDIR)/make/defs.mk
+include $(MODDIR)/make/rules.mk
+distclean: textclean localclean
+clean: textclean localclean
+install: $(INSTALL_MKDIR) $(INSTALLED_MKFILES)
+all: # nothing to be done
+profclean:

make/rpmdist.mk

@@ -39,7 +39,7 @@ rsync_ssh\://% ftp\://% scp\://%:
 	$(UPLOAD_SH) $(shell echo $(addprefix $(DIST_PCKG_DIR)/,$(notdir $@)) $@ | sed 's/:.*//g') $@
 	
 cpmod.dist:
-	for mod in $(REQUIRED); do \
+	for mod in $(SUBDIRS); do \
 		make -C $$mod distclean ;\
 		mkdir -p $(DIST_SRC_DIR)/$$mod ;\
 		tar -C $$mod \
@@ -52,6 +52,7 @@ cpmod.dist:
 			--exclude='*.o'     \
 			--exclude='*~'      \
 			--exclude=xml-flat  \
+			--exclude=contrib   \
 		-cf - . |  tar -C $(DIST_SRC_DIR)/$$mod -xf - ;\
 	done
 	touch $@

make/rules.mk

@@ -69,7 +69,7 @@ endif
 $(LIBS):
 	make -C $(LIBDIR) all
 
-$(INSTALL_HDRDIR) $(INSTALL_BINDIR) $(INSTALL_LIBDIR):
+$(INSTALL_HDRDIR) $(INSTALL_BINDIR) $(INSTALL_LIBDIR) $(INSTALL_MKDIR):
 	mkdir -p $@
 
 $(INSTALLED_LIB_SO) $(INSTALLED_LIB_A): $(INSTALL_LIBDIR)
@@ -95,6 +95,9 @@ $(INSTALL_LIBDIR)/%.$(SO_SUFFIX): %.$(SO_SUFFIX)
 $(INSTALL_HDRDIR)/%.h: %.h
 	$(INSTALL) -o $(HDROWNER) -g $(HDRGROUP) -m $(HDRMODE) $< $@
 
+$(INSTALL_MKDIR)/%.mk: %.mk
+	$(INSTALL) -o $(HDROWNER) -g $(HDRGROUP) -m $(HDRMODE) $< $@
+
 $(INSTALL_DOCDIR_DIST)/% $(INSTALL_DOCDIR_DEVEL)/%: %
 	mkdir -p $(dir $@)
 	$(INSTALL) -o $(HDROWNER) -g $(HDRGROUP) -m $(HDRMODE) $< $@