From 7bbf7c9a41823ee74e5063b9d9d36bc1ce47728c Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Tue, 21 Aug 2007 16:20:30 +0000
Subject: [PATCH] make: Standardized

---
 make/doc-rules.mk |  7 ++-----
 make/include.mk   | 11 ++++++-----
 make/lib.mk       | 14 +++-----------
 make/yapp.mk      |  4 ++--
 4 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/make/doc-rules.mk b/make/doc-rules.mk
index 294febf7..06b6b312 100644
--- a/make/doc-rules.mk
+++ b/make/doc-rules.mk
@@ -4,12 +4,9 @@
 # $Id$
 
 all:
-ifeq ($(shell pwd | xargs basename),devel)
-install: $(INSTALLED_DOCS_DEVEL)
-else
-install: $(INSTALLED_DOCS_DIST)
-endif
+install: install_DOC
 clean: doc.clean
+distclean:
 
 doc.clean:
 	rm -rf *~ .*.swp
diff --git a/make/include.mk b/make/include.mk
index 3b5034c6..559b8b81 100644
--- a/make/include.mk
+++ b/make/include.mk
@@ -1,9 +1,10 @@
 include $(MODDIR)/make/defs.mk
+include $(MODDIR)/make/rules.mk
 
 all:
-clean:
-	rm -rf *.h *~ .*.swp *.done
-distclean: clean
-install: hdrdir.done $(INSTALLED_H)
+clean: clean.include
+install: install_HDR
+
+clean.include:
+	rm -rf *.h *~ .*.swp *.done
 
-include $(MODDIR)/make/rules.mk
diff --git a/make/lib.mk b/make/lib.mk
index b1057f4d..b59502f8 100644
--- a/make/lib.mk
+++ b/make/lib.mk
@@ -3,17 +3,14 @@
 # contact@jannet.de
 # $Id$
 
-
 include $(MODDIR)/make/defs.mk
-TESTVAR := $(LDFLAGS)
-all: $(LIB_SO) $(LINKS_SO) $(MSVCPP_IMPLIB) $(STRIP_DONE)
-
 include $(MODDIR)/make/rules.mk
 
-install: $(LOCAL_TARGETS) all target-dir.done \
-	$(sort $(INSTALLED_LIB_A) $(INSTALLED_LIB_SO) $(INSTALLED_LINKS_SO) $(wildcard *.a))
+all: $(LIB_SO) $(LINKS_SO) $(MSVCPP_IMPLIB) $(STRIP_DONE)
+install: install_LIB
 clean: libclean local_libclean
 distclean: clean
+
 local_libclean: clean.mingw clean.unix clean.all
 
 clean.unix:
@@ -28,8 +25,3 @@ endif
 
 clean.all:
 	rm -rf *.a *.o *~ st* .*.swp *.done
-
-target-dir.done:
-	test -d $(INSTALL_LIBDIR) || $(INSTALL) -m $(EXEMODE) -o $(EXEOWNER) -d $(INSTALL_LIBDIR)
-	touch $@
-
diff --git a/make/yapp.mk b/make/yapp.mk
index 89e38585..0948878f 100644
--- a/make/yapp.mk
+++ b/make/yapp.mk
@@ -8,8 +8,8 @@ LOCAL_LDFLAGS   += -rdynamic
 
 include $(MODDIR)/make/exe.mk
 
-all:
-install:
+all: build_EXE
+install: install_EXE
 clean: clean.yapp
 distclean: