[complement-svn] SF.net SVN: complement: [1443] trunk/complement/explore/Makefiles

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1443
          http://svn.sourceforge.net/complement/?rev=1443&view=rev
Author:   complement
Date:     2006-12-12 00:22:57 -0800 (Tue, 12 Dec 2006)

Log Message:
-----------
clean garbage; unify EXTRA_PRE/POST and POST_INSTALL for libs and applications

Modified Paths:
--------------
    trunk/complement/explore/Makefiles/gmake/app/rules-install.mak
    trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak

Removed Paths:
-------------
    trunk/complement/explore/Makefiles/Makefile.inc
    trunk/complement/explore/Makefiles/Makefile.inc.KCC
    trunk/complement/explore/Makefiles/app/
    trunk/complement/explore/Makefiles/lib/

Deleted: trunk/complement/explore/Makefiles/Makefile.inc
===================================================================

--- trunk/complement/explore/Makefiles/Makefile.inc	2006-12-12 08:21:49 UTC (rev 1442)
+++ trunk/complement/explore/Makefiles/Makefile.inc	2006-12-12 08:22:57 UTC (rev 1443)
@@ -1,168 +0,0 @@
-# -*- Makefile -*- Time-stamp: <02/03/11 21:34:56 ptr>
-# $Id$
-
-DBG_SUFFIX = -g
-
-OUTPUT_DIR     = obj/$(COMPILER_NAME)/shared$(EXTRA_DIRS)
-OUTPUT_DIR_DBG = obj/$(COMPILER_NAME)/shared-g$(EXTRA_DIRS)
-OUTPUT_DIR_STLDBG = obj/$(COMPILER_NAME)/shared-stlg$(EXTRA_DIRS)
-
-OUTPUT_DIR_A     = obj/$(COMPILER_NAME)/static$(EXTRA_DIRS)
-OUTPUT_DIR_A_DBG = obj/$(COMPILER_NAME)/static-g$(EXTRA_DIRS)
-OUTPUT_DIR_A_STLDBG = obj/$(COMPILER_NAME)/static-stlg$(EXTRA_DIRS)
-
-INSTALL_LIB_DIR = ${BASEDIR}/build/lib
-INSTALL_BIN_DIR = ${BASEDIR}/build/bin
-
-$(OUTPUT_DIR):
-	@if [ ! -d ${OUTPUT_DIR} ] ; then \
-	  mkdir -p $(OUTPUT_DIR) ; \
-	fi
-
-$(OUTPUT_DIR_DBG):
-	@if [ ! -d ${OUTPUT_DIR_DBG} ] ; then \
-	  mkdir -p $(OUTPUT_DIR_DBG) ; \
-	fi
-
-$(OUTPUT_DIR_STLDBG):
-	@if [ ! -d ${OUTPUT_DIR_STLDBG} ] ; then \
-	  mkdir -p $(OUTPUT_DIR_STLDBG) ; \
-	fi
-
-$(OUTPUT_DIR_A):
-	@if [ ! -d ${OUTPUT_DIR_A} ] ; then \
-	  mkdir -p $(OUTPUT_DIR_A) ; \
-	fi
-
-$(OUTPUT_DIR_A_DBG):
-	@if [ ! -d ${OUTPUT_DIR_A_DBG} ] ; then \
-	  mkdir -p $(OUTPUT_DIR_A_DBG) ; \
-	fi
-
-$(OUTPUT_DIR_A_STLDBG):
-	@if [ ! -d ${OUTPUT_DIR_A_STLDBG} ] ; then \
-	  mkdir -p $(OUTPUT_DIR_A_STLDBG) ; \
-	fi
-
-$(OUTPUT_DIR)/%.o:	%.cc
-	$(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR)/%.o:	%.cpp
-	$(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR)/%.o:	%.c
-	$(COMPILE.c) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_DBG)/%.o:	%.cc
-	$(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_DBG)/%.o:	%.cpp
-	$(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_DBG)/%.o:	%.c
-	$(COMPILE.c) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_STLDBG)/%.o:	%.cc
-	$(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_STLDBG)/%.o:	%.cpp
-	$(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_STLDBG)/%.o:	%.c
-	$(COMPILE.c) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_A)/%.o:	%.cc
-	$(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_A)/%.o:	%.cpp
-	$(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_A)/%.o:	%.c
-	$(COMPILE.c) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_A_DBG)/%.o:	%.cc
-	$(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_A_DBG)/%.o:	%.cpp
-	$(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_A_DBG)/%.o:	%.c
-	$(COMPILE.c) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_A_STLDBG)/%.o:	%.cc
-	$(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_A_STLDBG)/%.o:	%.cpp
-	$(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_A_STLDBG)/%.o:	%.c
-	$(COMPILE.c) $(OUTPUT_OPTION) $<
-
-OBJ      = $(SRC_CC:%.cc=$(OUTPUT_DIR)/%.o)
-OBJ     += $(SRC_CPP:%.cpp=$(OUTPUT_DIR)/%.o)
-OBJ     += $(SRC_C:%.c=$(OUTPUT_DIR)/%.o)
-OBJ_DBG  = $(SRC_CC:%.cc=$(OUTPUT_DIR_DBG)/%.o)
-OBJ_DBG += $(SRC_CPP:%.cpp=$(OUTPUT_DIR_DBG)/%.o)
-OBJ_DBG += $(SRC_C:%.c=$(OUTPUT_DIR_DBG)/%.o)
-OBJ_STLDBG  = $(SRC_CC:%.cc=$(OUTPUT_DIR_STLDBG)/%.o)
-OBJ_STLDBG += $(SRC_CPP:%.cpp=$(OUTPUT_DIR_STLDBG)/%.o)
-OBJ_STLDBG += $(SRC_C:%.c=$(OUTPUT_DIR_STLDBG)/%.o)
-DEP      = $(SRC_CC:%.cc=$(OUTPUT_DIR)/%.d)
-DEP     += $(SRC_CPP:%.cpp=$(OUTPUT_DIR)/%.d)
-DEP     += $(SRC_C:%.c=$(OUTPUT_DIR)/%.d)
-DEP_DBG  = $(SRC_CC:%.cc=$(OUTPUT_DIR_DBG)/%.d)
-DEP_DBG += $(SRC_CPP:%.cpp=$(OUTPUT_DIR_DBG)/%.d)
-DEP_DBG += $(SRC_C:%.c=$(OUTPUT_DIR_DBG)/%.d)
-DEP_STLDBG  = $(SRC_CC:%.cc=$(OUTPUT_DIR_STLDBG)/%.d)
-DEP_STLDBG += $(SRC_CPP:%.cpp=$(OUTPUT_DIR_STLDBG)/%.d)
-DEP_STLDBG += $(SRC_C:%.c=$(OUTPUT_DIR_STLDBG)/%.d)
-
-OBJ_A    = $(SRC_CC:%.cc=$(OUTPUT_DIR_A)/%.o)
-OBJ_A   += $(SRC_CPP:%.cpp=$(OUTPUT_DIR_A)/%.o)
-OBJ_A   += $(SRC_C:%.c=$(OUTPUT_DIR_A)/%.o)
-OBJ_A_DBG  = $(SRC_CC:%.cc=$(OUTPUT_DIR_A_DBG)/%.o)
-OBJ_A_DBG += $(SRC_CPP:%.cpp=$(OUTPUT_DIR_A_DBG)/%.o)
-OBJ_A_DBG += $(SRC_C:%.c=$(OUTPUT_DIR_A_DBG)/%.o)
-OBJ_A_STLDBG  = $(SRC_CC:%.cc=$(OUTPUT_DIR_A_STLDBG)/%.o)
-OBJ_A_STLDBG += $(SRC_CPP:%.cpp=$(OUTPUT_DIR_A_STLDBG)/%.o)
-OBJ_A_STLDBG += $(SRC_C:%.c=$(OUTPUT_DIR_A_STLDBG)/%.o)
-DEP_A    = $(SRC_CC:%.cc=$(OUTPUT_DIR_A)/%.d)
-DEP_A   += $(SRC_CPP:%.cpp=$(OUTPUT_DIR_A)/%.d)
-DEP_A   += $(SRC_C:%.c=$(OUTPUT_DIR_A)/%.d)
-DEP_A_DBG  = $(SRC_CC:%.cc=$(OUTPUT_DIR_A_DBG)/%.d)
-DEP_A_DBG += $(SRC_CPP:%.cpp=$(OUTPUT_DIR_A_DBG)/%.d)
-DEP_A_DBG += $(SRC_C:%.c=$(OUTPUT_DIR_A_DBG)/%.d)
-DEP_A_STLDBG  = $(SRC_CC:%.cc=$(OUTPUT_DIR_A_STLDBG)/%.d)
-DEP_A_STLDBG += $(SRC_CPP:%.cpp=$(OUTPUT_DIR_A_STLDBG)/%.d)
-DEP_A_STLDBG += $(SRC_C:%.c=$(OUTPUT_DIR_A_STLDBG)/%.d)
-
-clear-release-shared::
-	@-rm -f $(OBJ) $(DEP)
-
-clear-release-static::
-	@-rm -f $(OBJ_A) $(DEP_A)
-
-clear-dbg-shared::
-	@-rm -f $(OBJ_DBG) $(DEP_DBG)
-
-clear-stldbg-shared::
-	@-rm -f $(OBJ_STLDBG) $(DEP_STLDBG)
-
-clear-dbg-static::
-	@-rm -f $(OBJ_A_DBG) $(DEP_A_DBG)
-
-clear-stldbg-static::
-	@-rm -f $(OBJ_A_STLDBG) $(DEP_A_STLDBG)
-
-clear::	clear-release-shared \
-	clear-dbg-shared clear-stldbg-shared \
-	clear-release-static \
-	clear-dbg-static clear-stldbg-static
-	rm -f .make.state core .make.depend
-
-# %.o:	../%.cc
-#	$(COMPILE.cc) $(OUTPUT_OPTION) $<
-#
-#%.o:	../%.c
-#	$(COMPILE.c) $(OUTPUT_OPTION) $<
-

Deleted: trunk/complement/explore/Makefiles/Makefile.inc.KCC
===================================================================
--- trunk/complement/explore/Makefiles/Makefile.inc.KCC	2006-12-12 08:21:49 UTC (rev 1442)
+++ trunk/complement/explore/Makefiles/Makefile.inc.KCC	2006-12-12 08:22:57 UTC (rev 1443)
@@ -1,38 +0,0 @@
-# Time-stamp: <99/12/23 14:17:26 ptr>
-# $SunId$ %Q%
-
-.KEEP_STATE:
-.PARALLEL:
-.SUFFIXES:
-.SCCS_GET:
-
-OS_VER:sh =uname -sr | sed -e s/\[\.\ \]/_/g
-
-INCLUDES = -I$(BASEDIR)/include/stlport-3.2.2
-
-DEFS = -D__$(OS_VER)
-
-CCC = KCC
-INSTALL = /usr/ucb/install
-# OUTPUT_DIR = obj
-OUTPUT_OPTION = -o $@
-CPPFLAGS = $(DEFS) $(INCLUDES)
-LDFLAGS = 
-libdbg_a := DEFS += -D_DEBUG -D_DEBUG_ALLOC
-libdbg_so := DEFS += -D_DEBUG -D_DEBUG_ALLOC
-dbg := DEFS += -D_DEBUG -D_DEBUG_ALLOC
-
-# For CC
-
-dbg := OPT = -g +K0
-libdbg_a := OPT = -g +K0
-libdbg_so := OPT = -g +K0 -Kpic
-CCFLAGS = --thread_safe $(OPT)
-libdbg_a := LDFLAGS += 
-libdbg_so := LDFLAGS += 
-
-%.o:	../%.cc
-	$(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-clear::
-	?-rm -f .make.state core

Modified: trunk/complement/explore/Makefiles/gmake/app/rules-install.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/rules-install.mak	2006-12-12 08:21:49 UTC (rev 1442)
+++ trunk/complement/explore/Makefiles/gmake/app/rules-install.mak	2006-12-12 08:22:57 UTC (rev 1443)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <06/11/17 00:21:21 ptr>
+# -*- makefile -*- Time-stamp: <06/12/12 09:37:04 ptr>
 #
 # Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
 # Petr Ovtchenkov
@@ -47,12 +47,14 @@
 	$(INSTALL_EXE) ${PRG} $(INSTALL_BIN_DIR)/${INSTALL_PRGNAME}
 endif
 	$(INSTALL_PRGNAME_CMD)
+	$(POST_INSTALL)
 
 install-dbg-shared: dbg-shared $(INSTALL_BIN_DIR_DBG)
 ifdef PRGNAME
 	$(INSTALL_EXE) ${PRG_DBG} $(INSTALL_BIN_DIR_DBG)/${INSTALL_PRGNAME_DBG}
 endif
 	$(INSTALL_PRGNAME_CMD_DBG)
+	$(POST_INSTALL_DBG)
 
 ifndef WITHOUT_STLPORT
 install-stldbg-shared: stldbg-shared $(INSTALL_BIN_DIR_STLDBG)
@@ -60,4 +62,5 @@
 	$(INSTALL_EXE) ${PRG_STLDBG} $(INSTALL_BIN_DIR_STLDBG)/${INSTALL_PRGNAME_STLDBG}
 endif
 	$(INSTALL_PRGNAME_CMD_STLDBG)
+	$(POST_INSTALL_STLDBG)
 endif

Modified: trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak	2006-12-12 08:21:49 UTC (rev 1442)
+++ trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak	2006-12-12 08:22:57 UTC (rev 1443)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <06/11/11 00:23:27 ptr>
+# -*- makefile -*- Time-stamp: <06/12/12 09:43:02 ptr>
 #
 # Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
 # Petr Ovtchenkov
@@ -13,12 +13,12 @@
 
 PHONY += release-shared dbg-shared stldbg-shared
 
-release-shared:	$(OUTPUT_DIR) ${SO_NAME_OUTxxx}
+release-shared:	$(EXTRA_PRE) $(OUTPUT_DIR) ${SO_NAME_OUTxxx} $(EXTRA_POST)
 
-dbg-shared:	$(OUTPUT_DIR_DBG) ${SO_NAME_OUT_DBGxxx}
+dbg-shared:	$(EXTRA_PRE_DBG) $(OUTPUT_DIR_DBG) ${SO_NAME_OUT_DBGxxx} $(EXTRA_POST_DBG)
 
 ifndef WITHOUT_STLPORT
-stldbg-shared:	$(OUTPUT_DIR_STLDBG) ${SO_NAME_OUT_STLDBGxxx}
+stldbg-shared:	$(EXTRA_PRE_STLDBG) $(OUTPUT_DIR_STLDBG) ${SO_NAME_OUT_STLDBGxxx} $(EXTRA_POST_STLDBG)
 endif
 
 define do_so_links_1


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


