Thread: [complement-svn] SF.net SVN: complement: [1390] trunk/complement/explore/Makefiles
Status: Pre-Alpha
Brought to you by:
complement
Menu
▾
▴
complement-svn
|
From: <com...@us...> - 2006-11-03 13:38:21
|
Revision: 1390
http://svn.sourceforge.net/complement/?rev=1390&view=rev
Author: complement
Date: 2006-11-03 05:38:09 -0800 (Fri, 03 Nov 2006)
Log Message:
-----------
generate rules with macro expansion---real metaprogramming
within make;
recursive file inclusion to build rules for few catalogs not
required more.
Notes: this changes may confuse GNU make 3.79.x; I check
this with GNU make 3.80 and 3.81---support of 3.80 has required
few workarounds relative smooth code for 3.81.
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak
trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak
trunk/complement/explore/Makefiles/gmake/targets.mak
Removed Paths:
-------------
trunk/complement/explore/Makefiles/gmake/dirsrc.mak
trunk/complement/explore/Makefiles/rules-d.mak
trunk/complement/explore/Makefiles/rules-o.mak
trunk/complement/explore/Makefiles/rules-res.mak
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2006-11-03 12:26:36 UTC (rev 1389)
+++ trunk/complement/explore/Makefiles/ChangeLog 2006-11-03 13:38:09 UTC (rev 1390)
@@ -1,3 +1,20 @@
+2006-11-03 Petr Ovtchenkov <pt...@is...>
+
+ * gmake/linux/rules-so.mak, gmake/linux/rules-install-so.mak:
+ generate rules with macro expansion---real metaprogramming
+ within make;
+
+ * gmake/targets.mak: generate rules with macro expansion,
+ recursive file inclusion to build rules for few catalogs not
+ required more.
+
+ * rules-d.mak, rules-res.mak, rules-o.mak, gmake/dirsrc.mak:
+ removed
+
+ * Notes: this changes may confuse GNU make 3.79.x; I check
+ this with GNU make 3.80 and 3.81---support of 3.80 has required
+ few workarounds relative smooth code for 3.81.
+
2006-11-02 Petr Ovtchenkov <pt...@is...>
* gmake/app/rules-install.mak, gmake/app/rules.mak:
Deleted: trunk/complement/explore/Makefiles/gmake/dirsrc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/dirsrc.mak 2006-11-03 12:26:36 UTC (rev 1389)
+++ trunk/complement/explore/Makefiles/gmake/dirsrc.mak 2006-11-03 13:38:09 UTC (rev 1390)
@@ -1,24 +0,0 @@
-# -*- Makefile -*- Time-stamp: <03/10/27 18:07:14 ptr>
-# $Id$
-
-# Some trick to build implicit rules for sources in some different
-# subdirectories. I remove catalogs from path to sources, with this
-# names I build output object path, and provide dependency from
-# source in directory. Due to no loops for rules definition, I should
-# use recursion here;
-
-# try take directory from list:
-WORD1 := $(word 1,$(DIRS_UNIQUE_SRC))
-
-# is still directory in the list?
-ifneq "$(WORD1)" ""
-include ${RULESBASE}/rules-o.mak
-include ${RULESBASE}/rules-d.mak
-ifeq ($(OSNAME),cygming)
-include ${RULESBASE}/rules-res.mak
-endif
-# remove processed directory from list
-DIRS_UNIQUE_SRC := $(filter-out $(WORD1),$(DIRS_UNIQUE_SRC))
-# recursive include here:
-include ${RULESBASE}/${USE_MAKE}/dirsrc.mak
-endif
Modified: trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak 2006-11-03 12:26:36 UTC (rev 1389)
+++ trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak 2006-11-03 13:38:09 UTC (rev 1390)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <06/11/02 10:43:02 ptr>
+# -*- makefile -*- Time-stamp: <06/11/03 11:47:01 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -19,97 +19,35 @@
install: $(INSTALL_TAGS)
-$(INSTALL_LIB_DIR)/${SO_NAMExxx}: ${SO_NAME_OUTxxx}
- $(INSTALL_SO) ${SO_NAME_OUTxxx} $(INSTALL_LIB_DIR)
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAMExx} ] ; then \
- if [ `readlink $(INSTALL_LIB_DIR)/${SO_NAMExx}` != "${SO_NAMExxx}" ]; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMExx}; \
- ln -s ${SO_NAMExxx} $(INSTALL_LIB_DIR)/${SO_NAMExx}; \
- fi \
- else \
- ln -s ${SO_NAMExxx} $(INSTALL_LIB_DIR)/${SO_NAMExx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAMEx} ] ; then \
- if [ `readlink $(INSTALL_LIB_DIR)/${SO_NAMEx}` != "${SO_NAMExx}" ]; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMEx}; \
- ln -s ${SO_NAMExx} $(INSTALL_LIB_DIR)/${SO_NAMEx}; \
- fi \
- else \
- ln -s ${SO_NAMExx} $(INSTALL_LIB_DIR)/${SO_NAMEx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAME} ] ; then \
- if [ `readlink $(INSTALL_LIB_DIR)/${SO_NAME}` != "${SO_NAMEx}" ]; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAME}; \
- ln -s ${SO_NAMEx} $(INSTALL_LIB_DIR)/${SO_NAME}; \
- fi \
- else \
- ln -s ${SO_NAMEx} $(INSTALL_LIB_DIR)/${SO_NAME}; \
- fi
+# Workaround forGNU make 3.80; see comments in rules-so.mak
+define do_install_so_links
+$${INSTALL_LIB_DIR$(1)}/$${SO_NAME$(1)xxx}: ${SO_NAME_OUT$(1)xxx}
+ $$(INSTALL_SO) $${SO_NAME_OUT$(1)xxx} $(INSTALL_LIB_DIR$(1))
+ $(call do_so_links_1,$$(INSTALL_LIB_DIR$(1)),$${SO_NAME$(1)xx},$${SO_NAME$(1)xxx})
+ $(call do_so_links_1,$$(INSTALL_LIB_DIR$(1)),$${SO_NAME$(1)x},$${SO_NAME$(1)xx})
+ $(call do_so_links_1,$$(INSTALL_LIB_DIR$(1)),$${SO_NAME$(1)},$${SO_NAME$(1)x})
+endef
+define do_install_so_links_wk
+# expand to nothing, if WITHOUT_STLPORT
+ifndef WITHOUT_STLPORT
+$(call do_install_so_links,$(1))
+endif
+endef
+
+$(eval $(call do_install_so_links,))
+$(eval $(call do_install_so_links,_DBG))
+# ifndef WITHOUT_STLPORT
+$(eval $(call do_install_so_links_wk,_STLDBG))
+# endif
+
install-release-shared: release-shared $(INSTALL_LIB_DIR) $(INSTALL_LIB_DIR)/${SO_NAMExxx}
${POST_INSTALL}
-$(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx}: ${SO_NAME_OUT_DBGxxx}
- $(INSTALL_SO) ${SO_NAME_OUT_DBGxxx} $(INSTALL_LIB_DIR_DBG)
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx} ] ; then \
- if [ `readlink $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx}` != "${SO_NAME_DBGxxx}" ]; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx}; \
- ln -s ${SO_NAME_DBGxxx} $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx}; \
- fi \
- else \
- ln -s ${SO_NAME_DBGxxx} $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx} ] ; then \
- if [ `readlink $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx}` != "${SO_NAME_DBGxx}" ]; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx}; \
- ln -s ${SO_NAME_DBGxx} $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx}; \
- fi \
- else \
- ln -s ${SO_NAME_DBGxx} $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG} ] ; then \
- if [ `readlink $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG}` != "${SO_NAME_DBGx}" ]; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG}; \
- ln -s ${SO_NAME_DBGx} $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG}; \
- fi \
- else \
- ln -s ${SO_NAME_DBGx} $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG}; \
- fi
-
-
install-dbg-shared: dbg-shared $(INSTALL_LIB_DIR_DBG) $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx}
${POST_INSTALL_DBG}
ifndef WITHOUT_STLPORT
-$(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx}: ${SO_NAME_OUT_STLDBGxxx}
- $(INSTALL_SO) ${SO_NAME_OUT_STLDBGxxx} $(INSTALL_LIB_DIR_STLDBG)
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx} ] ; then \
- if [ `readlink $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx}` != "${SO_NAME_STLDBGxxx}" ]; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx}; \
- ln -s ${SO_NAME_STLDBGxxx} $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx}; \
- fi \
- else \
- ln -s ${SO_NAME_STLDBGxxx} $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx} ] ; then \
- if [ `readlink $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx}` != "${SO_NAME_STLDBGxx}" ]; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx}; \
- ln -s ${SO_NAME_STLDBGxx} $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx}; \
- fi \
- else \
- ln -s ${SO_NAME_STLDBGxx} $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG} ] ; then \
- if [ `readlink $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG}` != "${SO_NAME_STLDBGx}" ]; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG}; \
- ln -s ${SO_NAME_STLDBGx} $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG}; \
- fi \
- else \
- ln -s ${SO_NAME_STLDBGx} $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG}; \
- fi
-
install-stldbg-shared: stldbg-shared $(INSTALL_LIB_DIR_STLDBG) $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx}
${POST_INSTALL_STLDBG}
-
-# WITHOUT_STLPORT
endif
Modified: trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak 2006-11-03 12:26:36 UTC (rev 1389)
+++ trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak 2006-11-03 13:38:09 UTC (rev 1390)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <06/11/02 10:40:52 ptr>
+# -*- makefile -*- Time-stamp: <06/11/03 11:45:22 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -18,187 +18,55 @@
dbg-shared: $(OUTPUT_DIR_DBG) ${SO_NAME_OUT_DBGxxx}
ifndef WITHOUT_STLPORT
-
stldbg-shared: $(OUTPUT_DIR_STLDBG) ${SO_NAME_OUT_STLDBGxxx}
-
endif
-ifeq ("${_C_SOURCES_ONLY}","")
+define do_so_links_1
+@if [ -h $(1)/$(2)} ] ; then \
+ if [ `readlink $(1)/$(2)` != "$(3)" ]; then \
+ rm $(1)/$(2); \
+ ln -s $(3) $(1)/$(2); \
+ fi \
+else \
+ ln -s $(3) $(1)/$(2); \
+fi
+endef
-${SO_NAME_OUTxxx}: $(OBJ) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- @if [ -h $(OUTPUT_DIR)/${SO_NAMExx} ] ; then \
- if [ `readlink $(OUTPUT_DIR)/${SO_NAMExx}` != "${SO_NAMExxx}" ]; then \
- rm $(OUTPUT_DIR)/${SO_NAMExx}; \
- ln -s ${SO_NAMExxx} $(OUTPUT_DIR)/${SO_NAMExx}; \
- fi \
- else \
- ln -s ${SO_NAMExxx} $(OUTPUT_DIR)/${SO_NAMExx}; \
- fi
- @if [ -h $(OUTPUT_DIR)/${SO_NAMEx} ] ; then \
- if [ `readlink $(OUTPUT_DIR)/${SO_NAMEx}` != "${SO_NAMExx}" ]; then \
- rm $(OUTPUT_DIR)/${SO_NAMEx}; \
- ln -s ${SO_NAMExx} $(OUTPUT_DIR)/${SO_NAMEx}; \
- fi \
- else \
- ln -s ${SO_NAMExx} $(OUTPUT_DIR)/${SO_NAMEx}; \
- fi
- @if [ -h $(OUTPUT_DIR)/${SO_NAME} ] ; then \
- if [ `readlink $(OUTPUT_DIR)/${SO_NAME}` != "${SO_NAMEx}" ]; then \
- rm $(OUTPUT_DIR)/${SO_NAME}; \
- ln -s ${SO_NAMEx} $(OUTPUT_DIR)/${SO_NAME}; \
- fi \
- else \
- ln -s ${SO_NAMEx} $(OUTPUT_DIR)/${SO_NAME}; \
- fi
+# Workaround for GNU make 3.80: it fail on 'eval' within 'if'
+# directive after some level of complexity, i.e. after complex
+# rules it fails on code:
+#
+# $(eval $(call do_so_links,cc,))
+# $(eval $(call do_so_links,cc,_DBG))
+# ifndef WITHOUT_STLPORT
+# $(eval $(call do_so_links,cc,_STLDBG))
+# endif
+#
+# Put 'if' logic into defined macro looks as workaround.
+#
+# The GNU make 3.81 free from this problem, but it new...
-${SO_NAME_OUT_DBGxxx}: $(OBJ_DBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_DBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- @if [ -h $(OUTPUT_DIR_DBG)/${SO_NAME_DBGxx} ] ; then \
- if [ `readlink $(OUTPUT_DIR_DBG)/${SO_NAME_DBGxx}` != "${SO_NAME_DBGxxx}" ]; then \
- rm $(OUTPUT_DIR_DBG)/${SO_NAME_DBGxx}; \
- ln -s ${SO_NAME_DBGxxx} $(OUTPUT_DIR_DBG)/${SO_NAME_DBGxx}; \
- fi \
- else \
- ln -s ${SO_NAME_DBGxxx} $(OUTPUT_DIR_DBG)/${SO_NAME_DBGxx}; \
- fi
- @if [ -h $(OUTPUT_DIR_DBG)/${SO_NAME_DBGx} ] ; then \
- if [ `readlink $(OUTPUT_DIR_DBG)/${SO_NAME_DBGx}` != "${SO_NAME_DBGxx}" ]; then \
- rm $(OUTPUT_DIR_DBG)/${SO_NAME_DBGx}; \
- ln -s ${SO_NAME_DBGxx} $(OUTPUT_DIR_DBG)/${SO_NAME_DBGx}; \
- fi \
- else \
- ln -s ${SO_NAME_DBGxx} $(OUTPUT_DIR_DBG)/${SO_NAME_DBGx}; \
- fi
- @if [ -h $(OUTPUT_DIR_DBG)/${SO_NAME_DBG} ] ; then \
- if [ `readlink $(OUTPUT_DIR_DBG)/${SO_NAME_DBG}` != "${SO_NAME_DBGx}" ]; then \
- rm $(OUTPUT_DIR_DBG)/${SO_NAME_DBG}; \
- ln -s ${SO_NAME_DBGx} $(OUTPUT_DIR_DBG)/${SO_NAME_DBG}; \
- fi \
- else \
- ln -s ${SO_NAME_DBGx} $(OUTPUT_DIR_DBG)/${SO_NAME_DBG}; \
- fi
-
-ifndef WITHOUT_STLPORT
-
-${SO_NAME_OUT_STLDBGxxx}: $(OBJ_STLDBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_STLDBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- @if [ -h $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGxx} ] ; then \
- if [ `readlink $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGxx}` != "${SO_NAME_STLDBGxxx}" ]; then \
- rm $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGxx}; \
- ln -s ${SO_NAME_STLDBGxxx} $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGxx}; \
- fi \
- else \
- ln -s ${SO_NAME_STLDBGxxx} $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGxx}; \
- fi
- @if [ -h $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGx} ] ; then \
- if [ `readlink $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGx}` != "${SO_NAME_STLDBGxx}" ]; then \
- rm $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGx}; \
- ln -s ${SO_NAME_STLDBGxx} $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGx}; \
- fi \
- else \
- ln -s ${SO_NAME_STLDBGxx} $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGx}; \
- fi
- @if [ -h $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBG} ] ; then \
- if [ `readlink $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBG}` != "${SO_NAME_STLDBGx}" ]; then \
- rm $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBG}; \
- ln -s ${SO_NAME_STLDBGx} $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBG}; \
- fi \
- else \
- ln -s ${SO_NAME_STLDBGx} $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBG}; \
- fi
-
-# WITHOUT_STLPORT
+define do_so_links
+$${SO_NAME_OUT$(1)xxx}: $$(OBJ$(1)) $$(LIBSDEP)
+ifeq ("${_C_SOURCES_ONLY}","")
+ $$(LINK.cc) $$(LINK_OUTPUT_OPTION) $${START_OBJ} $$(OBJ$(1)) $$(LDLIBS) $${STDLIBS} $${END_OBJ}
+else
+ $$(LINK.c) $$(LINK_OUTPUT_OPTION) $$(OBJ$(1)) $$(LDLIBS)
endif
+ $(call do_so_links_1,$$(OUTPUT_DIR$(1)),$${SO_NAME$(1)xx},$${SO_NAME$(1)xxx})
+ $(call do_so_links_1,$$(OUTPUT_DIR$(1)),$${SO_NAME$(1)x},$${SO_NAME$(1)xx})
+ $(call do_so_links_1,$$(OUTPUT_DIR$(1)),$${SO_NAME$(1)},$${SO_NAME$(1)x})
+endef
-# _C_SOURCES_ONLY
-else
-
-${SO_NAME_OUTxxx}: $(OBJ) $(LIBSDEP)
- $(LINK.c) $(LINK_OUTPUT_OPTION) $(OBJ) $(LDLIBS)
- @if [ -h $(OUTPUT_DIR)/${SO_NAMExx} ] ; then \
- if [ `readlink $(OUTPUT_DIR)/${SO_NAMExx}` != "${SO_NAMExxx}" ]; then \
- rm $(OUTPUT_DIR)/${SO_NAMExx}; \
- ln -s ${SO_NAMExxx} $(OUTPUT_DIR)/${SO_NAMExx}; \
- fi \
- else \
- ln -s ${SO_NAMExxx} $(OUTPUT_DIR)/${SO_NAMExx}; \
- fi
- @if [ -h $(OUTPUT_DIR)/${SO_NAMEx} ] ; then \
- if [ `readlink $(OUTPUT_DIR)/${SO_NAMEx}` != "${SO_NAMExx}" ]; then \
- rm $(OUTPUT_DIR)/${SO_NAMEx}; \
- ln -s ${SO_NAMExx} $(OUTPUT_DIR)/${SO_NAMEx}; \
- fi \
- else \
- ln -s ${SO_NAMExx} $(OUTPUT_DIR)/${SO_NAMEx}; \
- fi
- @if [ -h $(OUTPUT_DIR)/${SO_NAME} ] ; then \
- if [ `readlink $(OUTPUT_DIR)/${SO_NAME}` != "${SO_NAMEx}" ]; then \
- rm $(OUTPUT_DIR)/${SO_NAME}; \
- ln -s ${SO_NAMEx} $(OUTPUT_DIR)/${SO_NAME}; \
- fi \
- else \
- ln -s ${SO_NAMEx} $(OUTPUT_DIR)/${SO_NAME}; \
- fi
-
-${SO_NAME_OUT_DBGxxx}: $(OBJ_DBG) $(LIBSDEP)
- $(LINK.c) $(LINK_OUTPUT_OPTION) $(OBJ_DBG) $(LDLIBS)
- @if [ -h $(OUTPUT_DIR_DBG)/${SO_NAME_DBGxx} ] ; then \
- if [ `readlink $(OUTPUT_DIR_DBG)/${SO_NAME_DBGxx}` != "${SO_NAME_DBGxxx}" ]; then \
- rm $(OUTPUT_DIR_DBG)/${SO_NAME_DBGxx}; \
- ln -s ${SO_NAME_DBGxxx} $(OUTPUT_DIR_DBG)/${SO_NAME_DBGxx}; \
- fi \
- else \
- ln -s ${SO_NAME_DBGxxx} $(OUTPUT_DIR_DBG)/${SO_NAME_DBGxx}; \
- fi
- @if [ -h $(OUTPUT_DIR_DBG)/${SO_NAME_DBGx} ] ; then \
- if [ `readlink $(OUTPUT_DIR_DBG)/${SO_NAME_DBGx}` != "${SO_NAME_DBGxx}" ]; then \
- rm $(OUTPUT_DIR_DBG)/${SO_NAME_DBGx}; \
- ln -s ${SO_NAME_DBGxx} $(OUTPUT_DIR_DBG)/${SO_NAME_DBGx}; \
- fi \
- else \
- ln -s ${SO_NAME_DBGxx} $(OUTPUT_DIR_DBG)/${SO_NAME_DBGx}; \
- fi
- @if [ -h $(OUTPUT_DIR_DBG)/${SO_NAME_DBG} ] ; then \
- if [ `readlink $(OUTPUT_DIR_DBG)/${SO_NAME_DBG}` != "${SO_NAME_DBGx}" ]; then \
- rm $(OUTPUT_DIR_DBG)/${SO_NAME_DBG}; \
- ln -s ${SO_NAME_DBGx} $(OUTPUT_DIR_DBG)/${SO_NAME_DBG}; \
- fi \
- else \
- ln -s ${SO_NAME_DBGx} $(OUTPUT_DIR_DBG)/${SO_NAME_DBG}; \
- fi
-
+define do_so_links_wk
+# expand to nothing, if WITHOUT_STLPORT
ifndef WITHOUT_STLPORT
-
-${SO_NAME_OUT_STLDBGxxx}: $(OBJ_STLDBG) $(LIBSDEP)
- $(LINK.c) $(LINK_OUTPUT_OPTION) $(OBJ_STLDBG) $(LDLIBS)
- @if [ -h $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGxx} ] ; then \
- if [ `readlink $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGxx}` != "${SO_NAME_STLDBGxxx}" ]; then \
- rm $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGxx}; \
- ln -s ${SO_NAME_STLDBGxxx} $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGxx}; \
- fi \
- else \
- ln -s ${SO_NAME_STLDBGxxx} $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGxx}; \
- fi
- @if [ -h $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGx} ] ; then \
- if [ `readlink $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGx}` != "${SO_NAME_STLDBGxx}" ]; then \
- rm $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGx}; \
- ln -s ${SO_NAME_STLDBGxx} $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGx}; \
- fi \
- else \
- ln -s ${SO_NAME_STLDBGxx} $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGx}; \
- fi
- @if [ -h $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBG} ] ; then \
- if [ `readlink $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBG}` != "${SO_NAME_STLDBGx}" ]; then \
- rm $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBG}; \
- ln -s ${SO_NAME_STLDBGx} $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBG}; \
- fi \
- else \
- ln -s ${SO_NAME_STLDBGx} $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBG}; \
- fi
-
-# WITHOUT_STLPORT
+$(call do_so_links,$(1))
endif
+endef
-# !_C_SOURCES_ONLY
-endif
+$(eval $(call do_so_links,))
+$(eval $(call do_so_links,_DBG))
+# ifndef WITHOUT_STLPORT
+$(eval $(call do_so_links_wk,_STLDBG))
+# endif
Modified: trunk/complement/explore/Makefiles/gmake/targets.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/targets.mak 2006-11-03 12:26:36 UTC (rev 1389)
+++ trunk/complement/explore/Makefiles/gmake/targets.mak 2006-11-03 13:38:09 UTC (rev 1390)
@@ -1,5 +1,13 @@
-# Time-stamp: <05/04/15 17:23:30 ptr>
-# $Id$
+# Time-stamp: <06/11/03 12:09:39 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
# If we have no C++ sources, let's use C compiler for linkage instead of C++.
ifeq ("$(sort ${SRC_CC} ${SRC_CPP} ${SRC_CXX})","")
@@ -7,16 +15,85 @@
_C_SOURCES_ONLY := true
endif
-# if sources disposed in several dirs, calculate
-# appropriate rules; here is recursive call!
+# if sources disposed in several dirs, calculate appropriate rules
DIRS_UNIQUE_SRC := $(dir $(SRC_CPP) $(SRC_CC) $(SRC_CXX) $(SRC_C) $(SRC_S) )
ifeq (${OSNAME},cygming)
-DIRS_UNIQUE_SRC += $(dir $(SRC_RC) )
+DIRS_UNIQUE_SRC := ${DIRS_UNIQUE_SRC} $(dir $(SRC_RC) )
endif
DIRS_UNIQUE_SRC := $(sort $(DIRS_UNIQUE_SRC) )
-include ${RULESBASE}/${USE_MAKE}/dirsrc.mak
+# The rules below may be even simpler (i.e. define macro that generate
+# rules for COMPILE.xx), but this GNU make 3.80 unhappy with it;
+# GNU make 3.81 work fine, but 3.81 is new...
+# The code below verbose, but this is price for compatibility with 3.80
+
+define rule_o
+$$(OUTPUT_DIR$(1))/%.o: $(2)%.cc
+ $$(COMPILE.cc) $$(OUTPUT_OPTION) $$<
+
+$$(OUTPUT_DIR$(1))/%.d: $(2)%.cc
+ @$$(COMPILE.cc) $$(CCDEPFLAGS) $$< $$(DP_OUTPUT_DIR$(1))
+
+$$(OUTPUT_DIR$(1))/%.o: $(2)%.cpp
+ $$(COMPILE.cc) $$(OUTPUT_OPTION) $$<
+
+$$(OUTPUT_DIR$(1))/%.d: $(2)%.cpp
+ @$$(COMPILE.cc) $$(CCDEPFLAGS) $$< $$(DP_OUTPUT_DIR$(1))
+
+$$(OUTPUT_DIR$(1))/%.o: $(2)%.cxx
+ $$(COMPILE.cc) $$(OUTPUT_OPTION) $$<
+
+$$(OUTPUT_DIR$(1))/%.d: $(2)%.cxx
+ @$$(COMPILE.cc) $$(CCDEPFLAGS) $$< $$(DP_OUTPUT_DIR$(1))
+
+$$(OUTPUT_DIR$(1))/%.o: $(2)%.c
+ $$(COMPILE.c) $$(OUTPUT_OPTION) $$<
+
+$$(OUTPUT_DIR$(1))/%.d: $(2)%.c
+ @$$(COMPILE.c) $$(CCDEPFLAGS) $$< $$(DP_OUTPUT_DIR$(1))
+
+$$(OUTPUT_DIR$(1))/%.o: $(2)%.s
+ $$(COMPILE.s) $$(OUTPUT_OPTION) $$<
+
+$$(OUTPUT_DIR$(1))/%.o: $(2)%.S
+ $$(COMPILE.S) $$(OUTPUT_OPTION) $$<
+
+$$(OUTPUT_DIR$(1))/%.d: $(2)%.S
+ @$$(COMPILE.S) $$(SDEPFLAGS) $$< $$(DP_OUTPUT_DIR$(1))
+endef
+
+define rule_rc
+$$(OUTPUT_DIR$(1))/%.res: $(2)%.rc
+ $$(COMPILE.rc) $$(RC_OUTPUT_OPTION) $$<
+endef
+
+define rules_
+$(call rule_o,,$(1))
+ifneq ($(OUTPUT_DIR),$(OUTPUT_DIR_A))
+$(call rule_o,_A,$(1))
+endif
+$(call rule_o,_DBG,$(1))
+ifneq ($(OUTPUT_DIR_DBG),$(OUTPUT_DIR_A_DBG))
+$(call rule_o,_A_DBG,$(1))
+endif
+ifndef WITHOUT_STLPORT
+$(call rule_o,_STLDBG,$(1))
+ifneq ($(OUTPUT_DIR_STLDBG),$(OUTPUT_DIR_A_STLDBG))
+$(call rule_o,_A_STLDBG,$(1))
+endif
+endif
+ifeq ($(OSNAME),cygming)
+$(call rule_rc,,$(1))
+$(call rule_rc,_DBG,$(1))
+ifndef WITHOUT_STLPORT
+$(call rule_rc,_STLDBG,$(1))
+endif
+endif
+endef
+
+$(foreach dir,$(DIRS_UNIQUE_SRC),$(eval $(call rules_,$(dir))))
+
ALLBASE := $(basename $(notdir $(SRC_CC) $(SRC_CPP) $(SRC_CXX) $(SRC_C) $(SRC_S)))
ifeq (${OSNAME},cygming)
RCBASE += $(basename $(notdir $(SRC_RC)))
Deleted: trunk/complement/explore/Makefiles/rules-d.mak
===================================================================
--- trunk/complement/explore/Makefiles/rules-d.mak 2006-11-03 12:26:36 UTC (rev 1389)
+++ trunk/complement/explore/Makefiles/rules-d.mak 2006-11-03 13:38:09 UTC (rev 1390)
@@ -1,92 +0,0 @@
-# -*- Makefile -*- Time-stamp: <05/08/04 07:42:06 ptr>
-# $Id$
-
-# Rules for release output:
-
-$(OUTPUT_DIR)/%.d: $(WORD1)%.cpp
- @$(COMPILE.cc) $(CCDEPFLAGS) $< $(DP_OUTPUT_DIR)
-
-$(OUTPUT_DIR)/%.d: $(WORD1)%.cc
- @$(COMPILE.cc) $(CCDEPFLAGS) $< $(DP_OUTPUT_DIR)
-
-$(OUTPUT_DIR)/%.d: $(WORD1)%.cxx
- @$(COMPILE.cc) $(CCDEPFLAGS) $< $(DP_OUTPUT_DIR)
-
-$(OUTPUT_DIR)/%.d: $(WORD1)%.c
- @$(COMPILE.c) $(CDEPFLAGS) $< $(DP_OUTPUT_DIR)
-
-ifneq ($(OUTPUT_DIR),$(OUTPUT_DIR_A))
-
-$(OUTPUT_DIR_A)/%.d: $(WORD1)%.cpp
- @$(COMPILE.cc) $(CCDEPFLAGS) $< $(DP_OUTPUT_DIR)
-
-$(OUTPUT_DIR_A)/%.d: $(WORD1)%.cc
- @$(COMPILE.cc) $(CCDEPFLAGS) $< $(DP_OUTPUT_DIR)
-
-$(OUTPUT_DIR_A)/%.d: $(WORD1)%.cxx
- @$(COMPILE.cc) $(CCDEPFLAGS) $< $(DP_OUTPUT_DIR)
-
-$(OUTPUT_DIR_A)/%.d: $(WORD1)%.c
- @$(COMPILE.c) $(CDEPFLAGS) $< $(DP_OUTPUT_DIR)
-
-endif
-
-# Rules for debug output:
-
-$(OUTPUT_DIR_DBG)/%.d: $(WORD1)%.cpp
- @$(COMPILE.cc) $(CCDEPFLAGS) $< $(DP_OUTPUT_DIR_DBG)
-
-$(OUTPUT_DIR_DBG)/%.d: $(WORD1)%.cc
- @$(COMPILE.cc) $(CCDEPFLAGS) $< $(DP_OUTPUT_DIR_DBG)
-
-$(OUTPUT_DIR_DBG)/%.d: $(WORD1)%.cxx
- @$(COMPILE.cc) $(CCDEPFLAGS) $< $(DP_OUTPUT_DIR_DBG)
-
-$(OUTPUT_DIR_DBG)/%.d: $(WORD1)%.c
- @$(COMPILE.c) $(CDEPFLAGS) $< $(DP_OUTPUT_DIR_DBG)
-
-ifneq ($(OUTPUT_DIR_DBG),$(OUTPUT_DIR_A_DBG))
-
-$(OUTPUT_DIR_A_DBG)/%.d: $(WORD1)%.cpp
- @$(COMPILE.cc) $(CCDEPFLAGS) $< $(DP_OUTPUT_DIR_DBG)
-
-$(OUTPUT_DIR_A_DBG)/%.d: $(WORD1)%.cc
- @$(COMPILE.cc) $(CCDEPFLAGS) $< $(DP_OUTPUT_DIR_DBG)
-
-$(OUTPUT_DIR_A_DBG)/%.d: $(WORD1)%.cxx
- @$(COMPILE.cc) $(CCDEPFLAGS) $< $(DP_OUTPUT_DIR_DBG)
-
-$(OUTPUT_DIR_A_DBG)/%.d: $(WORD1)%.c
- @$(COMPILE.c) $(CDEPFLAGS) $< $(DP_OUTPUT_DIR_DBG)
-
-endif
-
-# Rules for STLport debug output:
-
-$(OUTPUT_DIR_STLDBG)/%.d: $(WORD1)%.cpp
- @$(COMPILE.cc) $(CCDEPFLAGS) $< $(DP_OUTPUT_DIR_STLDBG)
-
-$(OUTPUT_DIR_STLDBG)/%.d: $(WORD1)%.cc
- @$(COMPILE.cc) $(CCDEPFLAGS) $< $(DP_OUTPUT_DIR_STLDBG)
-
-$(OUTPUT_DIR_STLDBG)/%.d: $(WORD1)%.cxx
- @$(COMPILE.cc) $(CCDEPFLAGS) $< $(DP_OUTPUT_DIR_STLDBG)
-
-$(OUTPUT_DIR_STLDBG)/%.d: $(WORD1)%.c
- @$(COMPILE.c) $(CDEPFLAGS) $< $(DP_OUTPUT_DIR_STLDBG)
-
-ifneq ($(OUTPUT_DIR_STLDBG),$(OUTPUT_DIR_A_STLDBG))
-
-$(OUTPUT_DIR_A_STLDBG)/%.d: $(WORD1)%.cpp
- @$(COMPILE.cc) $(CCDEPFLAGS) $< $(DP_OUTPUT_DIR_STLDBG)
-
-$(OUTPUT_DIR_A_STLDBG)/%.d: $(WORD1)%.cc
- @$(COMPILE.cc) $(CCDEPFLAGS) $< $(DP_OUTPUT_DIR_STLDBG)
-
-$(OUTPUT_DIR_A_STLDBG)/%.d: $(WORD1)%.cxx
- @$(COMPILE.cc) $(CCDEPFLAGS) $< $(DP_OUTPUT_DIR_STLDBG)
-
-$(OUTPUT_DIR_A_STLDBG)/%.d: $(WORD1)%.c
- @$(COMPILE.c) $(CDEPFLAGS) $< $(DP_OUTPUT_DIR_STLDBG)
-
-endif
Deleted: trunk/complement/explore/Makefiles/rules-o.mak
===================================================================
--- trunk/complement/explore/Makefiles/rules-o.mak 2006-11-03 12:26:36 UTC (rev 1389)
+++ trunk/complement/explore/Makefiles/rules-o.mak 2006-11-03 13:38:09 UTC (rev 1390)
@@ -1,128 +0,0 @@
-# -*- Makefile -*- Time-stamp: <05/04/18 08:02:06 ptr>
-# $Id$
-
-# Rules for release output:
-
-$(OUTPUT_DIR)/%.o: $(WORD1)%.cpp
- $(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR)/%.o: $(WORD1)%.cc
- $(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR)/%.o: $(WORD1)%.cxx
- $(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR)/%.o: $(WORD1)%.c
- $(COMPILE.c) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR)/%.o: $(WORD1)%.s
- $(COMPILE.s) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR)/%.o: $(WORD1)%.S
- $(COMPILE.S) $(OUTPUT_OPTION) $<
-
-ifneq ($(OUTPUT_DIR),$(OUTPUT_DIR_A))
-
-$(OUTPUT_DIR_A)/%.o: $(WORD1)%.cpp
- $(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_A)/%.o: $(WORD1)%.cc
- $(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_A)/%.o: $(WORD1)%.cxx
- $(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_A)/%.o: $(WORD1)%.c
- $(COMPILE.c) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_A)/%.o: $(WORD1)%.s
- $(COMPILE.s) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_A)/%.o: $(WORD1)%.S
- $(COMPILE.S) $(OUTPUT_OPTION) $<
-
-endif
-
-# Rules for debug output:
-
-$(OUTPUT_DIR_DBG)/%.o: $(WORD1)%.cpp
- $(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_DBG)/%.o: $(WORD1)%.cc
- $(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_DBG)/%.o: $(WORD1)%.cxx
- $(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_DBG)/%.o: $(WORD1)%.c
- $(COMPILE.c) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_DBG)/%.o: $(WORD1)%.s
- $(COMPILE.s) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_DBG)/%.o: $(WORD1)%.S
- $(COMPILE.S) $(OUTPUT_OPTION) $<
-
-ifneq ($(OUTPUT_DIR_DBG),$(OUTPUT_DIR_A_DBG))
-
-$(OUTPUT_DIR_A_DBG)/%.o: $(WORD1)%.cpp
- $(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_A_DBG)/%.o: $(WORD1)%.cc
- $(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_A_DBG)/%.o: $(WORD1)%.cxx
- $(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_A_DBG)/%.o: $(WORD1)%.c
- $(COMPILE.c) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_A_DBG)/%.o: $(WORD1)%.s
- $(COMPILE.s) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_A_DBG)/%.o: $(WORD1)%.S
- $(COMPILE.S) $(OUTPUT_OPTION) $<
-
-endif
-
-# Rules for STLport debug output:
-
-$(OUTPUT_DIR_STLDBG)/%.o: $(WORD1)%.cpp
- $(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_STLDBG)/%.o: $(WORD1)%.cc
- $(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_STLDBG)/%.o: $(WORD1)%.cxx
- $(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_STLDBG)/%.o: $(WORD1)%.c
- $(COMPILE.c) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_STLDBG)/%.o: $(WORD1)%.s
- $(COMPILE.s) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_STLDBG)/%.o: $(WORD1)%.S
- $(COMPILE.S) $(OUTPUT_OPTION) $<
-
-ifneq ($(OUTPUT_DIR_STLDBG),$(OUTPUT_DIR_A_STLDBG))
-
-$(OUTPUT_DIR_A_STLDBG)/%.o: $(WORD1)%.cpp
- $(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_A_STLDBG)/%.o: $(WORD1)%.cc
- $(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_A_STLDBG)/%.o: $(WORD1)%.cxx
- $(COMPILE.cc) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_A_STLDBG)/%.o: $(WORD1)%.c
- $(COMPILE.c) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_A_STLDBG)/%.o: $(WORD1)%.s
- $(COMPILE.s) $(OUTPUT_OPTION) $<
-
-$(OUTPUT_DIR_A_STLDBG)/%.o: $(WORD1)%.S
- $(COMPILE.S) $(OUTPUT_OPTION) $<
-
-endif
Deleted: trunk/complement/explore/Makefiles/rules-res.mak
===================================================================
--- trunk/complement/explore/Makefiles/rules-res.mak 2006-11-03 12:26:36 UTC (rev 1389)
+++ trunk/complement/explore/Makefiles/rules-res.mak 2006-11-03 13:38:09 UTC (rev 1390)
@@ -1,19 +0,0 @@
-# -*- Makefile -*- Time-stamp: <03/10/27 18:12:46 ptr>
-# $Id$
-
-# Rules for release output:
-
-$(OUTPUT_DIR)/%.res: $(WORD1)%.rc
- $(COMPILE.rc) $(RC_OUTPUT_OPTION) $<
-
-# Rules for debug output:
-
-$(OUTPUT_DIR_DBG)/%.res: $(WORD1)%.rc
- $(COMPILE.rc) $(RC_OUTPUT_OPTION) $<
-
-# Rules for STLport debug output:
-
-$(OUTPUT_DIR_STLDBG)/%.res: $(WORD1)%.rc
- $(COMPILE.rc) $(RC_OUTPUT_OPTION) $<
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2006-11-03 16:25:28
|
Revision: 1393
http://svn.sourceforge.net/complement/?rev=1393&view=rev
Author: complement
Date: 2006-11-03 08:25:19 -0800 (Fri, 03 Nov 2006)
Log Message:
-----------
fix issues WITHOUT_STLPORT
Modified Paths:
--------------
trunk/complement/explore/Makefiles/gmake/depend.mak
trunk/complement/explore/Makefiles/gmake/targetdirs.mak
trunk/complement/explore/Makefiles/top.mak
Modified: trunk/complement/explore/Makefiles/gmake/depend.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/depend.mak 2006-11-03 15:15:59 UTC (rev 1392)
+++ trunk/complement/explore/Makefiles/gmake/depend.mak 2006-11-03 16:25:19 UTC (rev 1393)
@@ -1,21 +1,43 @@
-# Time-stamp: <06/08/24 10:09:17 ptr>
+# Time-stamp: <06/11/03 18:38:39 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
PHONY += release-static-dep release-shared-dep dbg-static-dep dbg-shared-dep \
- stldbg-static-dep stldbg-shared-dep depend
+ depend
+ifndef WITHOUT_STLPORT
+PHONY += stldbg-static-dep stldbg-shared-dep
+endif
+
release-static-dep release-shared-dep: $(DEP)
dbg-static-dep dbg-shared-dep: $(DEP_DBG)
+ifndef WITHOUT_STLPORT
stldbg-static-dep stldbg-shared-dep: $(DEP_STLDBG)
-depend: $(OUTPUT_DIRS) release-shared-dep dbg-shared-dep stldbg-shared-dep
- @cat -s $(DEP) $(DEP_DBG) $(DEP_STLDBG) /dev/null > $(DEPENDS_COLLECTION)
+_ALL_DEP := $(DEP) $(DEP_DBG) $(DEP_STLDBG)
+_DASH_DEP := release-shared-dep dbg-shared-dep stldbg-shared-dep
+else
+_ALL_DEP := $(DEP) $(DEP_DBG)
+_DASH_DEP := release-shared-dep dbg-shared-dep
+endif
-TAGS: $(OUTPUT_DIRS) release-shared-dep dbg-shared-dep stldbg-shared-dep
- @etags -i -m `cat -s $(DEP) $(DEP_DBG) $(DEP_STLDBG) | sed 's/^.*://;s/\\\\$$//'`
-tags: $(OUTPUT_DIRS) release-shared-dep dbg-shared-dep stldbg-shared-dep
- @ctags -d -g -i -m -t `cat -s $(DEP) $(DEP_DBG) $(DEP_STLDBG) | sed 's/^.*://;s/\\\\$$//'`
+depend: $(OUTPUT_DIRS) ${_DASH_DEP}
+ @cat -s $(_ALL_DEP) /dev/null > $(DEPENDS_COLLECTION)
+TAGS: $(OUTPUT_DIRS) ${_DASH_DEP}
+ @etags -i -m `cat -s $(_ALL_DEP) /dev/null | sed 's/^.*://;s/\\\\$$//'`
+
+tags: $(OUTPUT_DIRS) ${_DASH_DEP}
+ @ctags -d -g -i -m -t `cat -s $(_ALL_DEP) /dev/null | sed 's/^.*://;s/\\\\$$//'`
+
-include $(DEPENDS_COLLECTION)
Modified: trunk/complement/explore/Makefiles/gmake/targetdirs.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/targetdirs.mak 2006-11-03 15:15:59 UTC (rev 1392)
+++ trunk/complement/explore/Makefiles/gmake/targetdirs.mak 2006-11-03 16:25:19 UTC (rev 1393)
@@ -1,4 +1,4 @@
-# Time-stamp: <06/10/12 19:53:42 ptr>
+# Time-stamp: <06/11/03 18:47:05 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -19,7 +19,9 @@
PRE_OUTPUT_DIR := $(BASE_OUTPUT_DIR)/$(TARGET_NAME)$(COMPILER_NAME)
OUTPUT_DIR := $(PRE_OUTPUT_DIR)/so$(EXTRA_DIRS)
OUTPUT_DIR_DBG := $(PRE_OUTPUT_DIR)/so_g$(EXTRA_DIRS)
+ifndef WITHOUT_STLPORT
OUTPUT_DIR_STLDBG := $(PRE_OUTPUT_DIR)/so_stlg$(EXTRA_DIRS)
+endif
# file to store generated dependencies for make:
DEPENDS_COLLECTION := $(PRE_OUTPUT_DIR)/.make.depend
@@ -27,7 +29,9 @@
# I use the same catalog, as for shared:
OUTPUT_DIR_A := $(OUTPUT_DIR)
OUTPUT_DIR_A_DBG := $(OUTPUT_DIR_DBG)
+ifndef WITHOUT_STLPORT
OUTPUT_DIR_A_STLDBG := $(OUTPUT_DIR_STLDBG)
+endif
BASE_INSTALL_DIR ?= ${SRCROOT}/build/$(TARGET_NAME)
@@ -36,16 +40,30 @@
INSTALL_LIB_DIR ?= ${BASE_INSTALL_LIB_DIR}lib
INSTALL_LIB_DIR_DBG ?= ${BASE_INSTALL_LIB_DIR}lib
+ifndef WITHOUT_STLPORT
INSTALL_LIB_DIR_STLDBG ?= ${BASE_INSTALL_LIB_DIR}lib
+endif
INSTALL_BIN_DIR ?= ${BASE_INSTALL_BIN_DIR}bin
INSTALL_BIN_DIR_DBG ?= ${INSTALL_BIN_DIR}_g
+ifndef WITHOUT_STLPORT
INSTALL_BIN_DIR_STLDBG ?= ${INSTALL_BIN_DIR}_stlg
+endif
+ifndef WITHOUT_STLPORT
OUTPUT_DIRS := $(OUTPUT_DIR) $(OUTPUT_DIR_DBG) $(OUTPUT_DIR_STLDBG) \
$(OUTPUT_DIR_A) $(OUTPUT_DIR_A_DBG) $(OUTPUT_DIR_A_STLDBG)
+else
+OUTPUT_DIRS := $(OUTPUT_DIR) $(OUTPUT_DIR_DBG) \
+ $(OUTPUT_DIR_A) $(OUTPUT_DIR_A_DBG)
+endif
+ifndef WITHOUT_STLPORT
INSTALL_LIB_DIRS := $(INSTALL_LIB_DIR) $(INSTALL_LIB_DIR_DBG) $(INSTALL_LIB_DIR_STLDBG)
INSTALL_BIN_DIRS := $(INSTALL_BIN_DIR) $(INSTALL_BIN_DIR_DBG) $(INSTALL_BIN_DIR_STLDBG)
+else
+INSTALL_LIB_DIRS := $(INSTALL_LIB_DIR) $(INSTALL_LIB_DIR_DBG)
+INSTALL_BIN_DIRS := $(INSTALL_BIN_DIR) $(INSTALL_BIN_DIR_DBG)
+endif
# sort will remove duplicates:
OUTPUT_DIRS := $(sort $(OUTPUT_DIRS))
Modified: trunk/complement/explore/Makefiles/top.mak
===================================================================
--- trunk/complement/explore/Makefiles/top.mak 2006-11-03 15:15:59 UTC (rev 1392)
+++ trunk/complement/explore/Makefiles/top.mak 2006-11-03 16:25:19 UTC (rev 1393)
@@ -1,4 +1,4 @@
-# Time-stamp: <06/11/02 10:32:17 ptr>
+# Time-stamp: <06/11/03 18:54:08 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -17,6 +17,9 @@
RULESBASE ?= $(SRCROOT)/Makefiles
+# include file, generated by configure, if available
+-include ${RULESBASE}/config.mak
+
ifndef WITHOUT_STLPORT
ALL_TAGS ?= release-shared dbg-shared stldbg-shared
else
@@ -33,9 +36,6 @@
all-shared: release-shared dbg-shared
endif
-# include file, generated by configure, if available
--include ${RULESBASE}/config.mak
-
ifdef WITHOUT_STLPORT
NOT_USE_NOSTDLIB := 1
endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2006-11-13 11:26:23
|
Revision: 1397
http://svn.sourceforge.net/complement/?rev=1397&view=rev
Author: complement
Date: 2006-11-13 03:26:07 -0800 (Mon, 13 Nov 2006)
Log Message:
-----------
change tags related to clean processes (to satisfy 'standard' tagets); fix options for etags and ctags
Modified Paths:
--------------
trunk/complement/explore/Makefiles/clean.mak
trunk/complement/explore/Makefiles/gmake/app/clean.mak
trunk/complement/explore/Makefiles/gmake/depend.mak
trunk/complement/explore/Makefiles/gmake/lib/clean.mak
trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak
trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak
trunk/complement/explore/Makefiles/gmake/linux/sys.mak
Modified: trunk/complement/explore/Makefiles/clean.mak
===================================================================
--- trunk/complement/explore/Makefiles/clean.mak 2006-11-10 19:09:03 UTC (rev 1396)
+++ trunk/complement/explore/Makefiles/clean.mak 2006-11-13 11:26:07 UTC (rev 1397)
@@ -1,7 +1,15 @@
-# -*- Makefile -*- Time-stamp: <03/07/15 12:19:04 ptr>
-# $Id$
+# -*- Makefile -*- Time-stamp: <06/11/11 01:06:53 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
-PHONY += clean clobber distclean
+PHONY += clean distclean mostlyclean maintainer-clean uninstall
clean::
@-rm -f core core.*
@@ -9,7 +17,12 @@
@-rm -f $(OBJ_DBG) $(DEP_DBG)
@-rm -f $(OBJ_STLDBG) $(DEP_STLDBG)
-clobber:: clean
+distclean:: clean
+
+mostlyclean: clean
@-rm -f $(DEPENDS_COLLECTION)
+ @-rm -f TAGS tags
-distclean:: clobber
+maintainer-clean: distclean
+ @rm -f ${RULESBASE}/config.mak
+ @-rm -f TAGS tags
Modified: trunk/complement/explore/Makefiles/gmake/app/clean.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/clean.mak 2006-11-10 19:09:03 UTC (rev 1396)
+++ trunk/complement/explore/Makefiles/gmake/app/clean.mak 2006-11-13 11:26:07 UTC (rev 1397)
@@ -1,12 +1,24 @@
-# -*- makefile -*- Time-stamp: <03/07/10 00:20:54 ptr>
-# $Id$
+# -*- makefile -*- Time-stamp: <06/11/11 00:43:13 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
-clobber::
+clean::
@-rm -f ${PRG}
@-rm -f ${PRG_DBG}
@-rm -f ${PRG_STLDBG}
distclean::
+ @-rm -f $(DEPENDS_COLLECTION)
+ @-rmdir -p ${OUTPUT_DIR} ${OUTPUT_DIR_DBG} ${OUTPUT_DIR_STLDBG} 2>/dev/null || exit 0
+
+uninstall:
@-rm -f $(INSTALL_BIN_DIR)/$(PRG)
@-rm -f $(INSTALL_BIN_DIR_DBG)/$(PRG_DBG)
@-rm -f $(INSTALL_BIN_DIR_STLDBG)/$(PRG_STLDBG)
Modified: trunk/complement/explore/Makefiles/gmake/depend.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/depend.mak 2006-11-10 19:09:03 UTC (rev 1396)
+++ trunk/complement/explore/Makefiles/gmake/depend.mak 2006-11-13 11:26:07 UTC (rev 1397)
@@ -1,4 +1,4 @@
-# Time-stamp: <06/11/03 18:38:39 ptr>
+# Time-stamp: <06/11/11 01:04:15 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -35,9 +35,9 @@
@cat -s $(_ALL_DEP) /dev/null > $(DEPENDS_COLLECTION)
TAGS: $(OUTPUT_DIRS) ${_DASH_DEP}
- @etags -i -m `cat -s $(_ALL_DEP) /dev/null | sed 's/^.*://;s/\\\\$$//'`
+ @etags -i -m `cat -s $(_ALL_DEP) /dev/null | sed 's/^.*://;s/\\\\$$//' | uniq -u`
tags: $(OUTPUT_DIRS) ${_DASH_DEP}
- @ctags -d -g -i -m -t `cat -s $(_ALL_DEP) /dev/null | sed 's/^.*://;s/\\\\$$//'`
+ @ctags -d --globals --declarations -t -w `cat -s $(_ALL_DEP) /dev/null | sed 's/^.*://;s/\\\\$$//' | uniq -u`
-include $(DEPENDS_COLLECTION)
Modified: trunk/complement/explore/Makefiles/gmake/lib/clean.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/clean.mak 2006-11-10 19:09:03 UTC (rev 1396)
+++ trunk/complement/explore/Makefiles/gmake/lib/clean.mak 2006-11-13 11:26:07 UTC (rev 1397)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <06/10/12 19:53:46 ptr>
+# -*- makefile -*- Time-stamp: <06/11/11 00:43:08 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -9,7 +9,7 @@
# Licensed under the Academic Free License version 3.0
#
-clobber::
+clean::
@-rm -f ${SO_NAME_OUT}
@-rm -f ${SO_NAME_OUTx}
@-rm -f ${SO_NAME_OUTxx}
@@ -25,7 +25,6 @@
@-rm -f ${A_NAME_OUT}
@-rm -f ${A_NAME_OUT_DBG}
@-rm -f ${A_NAME_OUT_STLDBG}
- @-rmdir -p ${OUTPUT_DIR} ${OUTPUT_DIR_DBG} ${OUTPUT_DIR_STLDBG} 2>/dev/null || exit 0
ifeq ($(OSNAME), cygming)
@-rm -f ${LIB_NAME_OUT}
@-rm -f ${LIB_NAME_OUT_DBG}
@@ -36,6 +35,10 @@
endif
distclean::
+ @-rm -f $(DEPENDS_COLLECTION)
+ @-rmdir -p ${OUTPUT_DIR} ${OUTPUT_DIR_DBG} ${OUTPUT_DIR_STLDBG} 2>/dev/null || exit 0
+
+uninstall:
@-rm -f $(INSTALL_LIB_DIR)/$(SO_NAME)
@-rm -f $(INSTALL_LIB_DIR)/$(SO_NAMEx)
@-rm -f $(INSTALL_LIB_DIR)/$(SO_NAMExx)
@@ -52,3 +55,4 @@
@-rm -f $(INSTALL_LIB_DIR_DBG)/${A_NAME_OUT_DBG}
@-rm -f $(INSTALL_LIB_DIR_STLDBG)/${A_NAME_OUT_STLDBG}
@-rmdir -p $(INSTALL_LIB_DIR) $(INSTALL_LIB_DIR_DBG) $(INSTALL_LIB_DIR_STLDBG) 2>/dev/null || exit 0
+
Modified: trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak 2006-11-10 19:09:03 UTC (rev 1396)
+++ trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak 2006-11-13 11:26:07 UTC (rev 1397)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <06/11/10 18:42:44 ptr>
+# -*- makefile -*- Time-stamp: <06/11/11 00:23:29 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -43,14 +43,52 @@
endif
-PHONY += install $(INSTALL_TAGS)
+ifndef INSTALL_STRIP_TAGS
+
+ifndef _NO_SHARED_BUILD
+INSTALL_STRIP_TAGS := install-strip-shared
+else
+INSTALL_STRIP_TAGS :=
+endif
+
+ifdef _STATIC_BUILD
+INSTALL_STRIP_TAGS += install-release-static
+endif
+
+ifndef _NO_DBG_BUILD
+ifndef _NO_SHARED_BUILD
+INSTALL_STRIP_TAGS += install-dbg-shared
+endif
+ifdef _STATIC_BUILD
+INSTALL_STRIP_TAGS += install-dbg-static
+endif
+endif
+
+ifndef _NO_STLDBG_BUILD
+ifndef WITHOUT_STLPORT
+ifndef _NO_SHARED_BUILD
+INSTALL_STRIP_TAGS += install-stldbg-shared
+endif
+ifdef _STATIC_BUILD
+INSTALL_STRIP_TAGS += install-stldbg-static
+endif
+endif
+endif
+
+endif
+
+
+PHONY += install install-strip $(INSTALL_TAGS) $(INSTALL_STRIP_TAGS)
+
install: $(INSTALL_TAGS)
+install-strip: $(INSTALL_STRIP_TAGS)
+
# Workaround forGNU make 3.80; see comments in rules-so.mak
define do_install_so_links
-$${INSTALL_LIB_DIR$(1)}/$${SO_NAME$(1)xxx}: ${SO_NAME_OUT$(1)xxx}
- $$(INSTALL_SO) $${SO_NAME_OUT$(1)xxx} $(INSTALL_LIB_DIR$(1))
+$${INSTALL_LIB_DIR$(1)}/$${SO_NAME$(1)xxx}: $${SO_NAME_OUT$(1)xxx}
+ $$(INSTALL_SO) $${SO_NAME_OUT$(1)xxx} $$(INSTALL_LIB_DIR$(1))
@$(call do_so_links_1,$$(INSTALL_LIB_DIR$(1)),$${SO_NAME$(1)xx},$${SO_NAME$(1)xxx})
@$(call do_so_links_1,$$(INSTALL_LIB_DIR$(1)),$${SO_NAME$(1)x},$${SO_NAME$(1)xx})
@$(call do_so_links_1,$$(INSTALL_LIB_DIR$(1)),$${SO_NAME$(1)},$${SO_NAME$(1)x})
@@ -72,6 +110,10 @@
install-release-shared: release-shared $(INSTALL_LIB_DIR) $(INSTALL_LIB_DIR)/${SO_NAMExxx}
${POST_INSTALL}
+install-strip-shared: release-shared $(INSTALL_LIB_DIR) $(INSTALL_LIB_DIR)/${SO_NAMExxx}
+ ${STRIP} ${_SO_STRIP_OPTION} $(INSTALL_LIB_DIR)/${SO_NAMExxx}
+ ${POST_INSTALL}
+
install-dbg-shared: dbg-shared $(INSTALL_LIB_DIR_DBG) $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx}
${POST_INSTALL_DBG}
Modified: trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak 2006-11-10 19:09:03 UTC (rev 1396)
+++ trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak 2006-11-13 11:26:07 UTC (rev 1397)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <06/11/03 11:45:22 ptr>
+# -*- makefile -*- Time-stamp: <06/11/11 00:23:27 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
Modified: trunk/complement/explore/Makefiles/gmake/linux/sys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/sys.mak 2006-11-10 19:09:03 UTC (rev 1396)
+++ trunk/complement/explore/Makefiles/gmake/linux/sys.mak 2006-11-13 11:26:07 UTC (rev 1397)
@@ -1,4 +1,4 @@
-# Time-stamp: <06/11/10 19:18:10 ptr>
+# Time-stamp: <06/11/10 23:43:27 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -15,6 +15,8 @@
install-strip: _INSTALL_STRIP_OPTION = -s
+install-strip: _SO_STRIP_OPTION = -S
+
INSTALL_SO := ${INSTALL} -c -m 0755 ${_INSTALL_STRIP_OPTION}
INSTALL_A := ${INSTALL} -c -m 0644
INSTALL_EXE := ${INSTALL} -c -m 0755
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2006-11-17 07:46:34
|
Revision: 1399
http://svn.sourceforge.net/complement/?rev=1399&view=rev
Author: complement
Date: 2006-11-16 23:46:32 -0800 (Thu, 16 Nov 2006)
Log Message:
-----------
ability to build few programs from same Makefile; pure C linkage may not work properly for multiple progrmas yet
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
trunk/complement/explore/Makefiles/clean.mak
trunk/complement/explore/Makefiles/gmake/app/clean.mak
trunk/complement/explore/Makefiles/gmake/app/macro.mak
trunk/complement/explore/Makefiles/gmake/app/rules-install.mak
trunk/complement/explore/Makefiles/gmake/app/rules.mak
trunk/complement/explore/Makefiles/gmake/lib/clean.mak
trunk/complement/explore/Makefiles/gmake/targets.mak
trunk/complement/explore/Makefiles/top.mak
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2006-11-13 18:25:20 UTC (rev 1398)
+++ trunk/complement/explore/Makefiles/ChangeLog 2006-11-17 07:46:32 UTC (rev 1399)
@@ -1,3 +1,16 @@
+2006-11-17 Petr Ovtchenkov <pt...@is...>
+
+ * gmake/app/rules.mak, rules-install.mak, macro.mak, clean.mak:
+ ability to build few programs from same Makefile; pure C linkage
+ may not work properly for multiple progrmas yet.
+
+ * gmake/targets.mak: idem
+
+ * clean.mak, top.mak: idem
+
+ * gmake/lib/clean.mak: idem, but main functionality for libraries
+ not completed yet.
+
2006-11-10 Petr Ovtchenkov <pt...@is...>
* gmake/app/rules.mak, gmake/app/gcc.mak: add static tags;
Modified: trunk/complement/explore/Makefiles/clean.mak
===================================================================
--- trunk/complement/explore/Makefiles/clean.mak 2006-11-13 18:25:20 UTC (rev 1398)
+++ trunk/complement/explore/Makefiles/clean.mak 2006-11-17 07:46:32 UTC (rev 1399)
@@ -1,4 +1,4 @@
-# -*- Makefile -*- Time-stamp: <06/11/11 01:06:53 ptr>
+# -*- Makefile -*- Time-stamp: <06/11/17 00:25:42 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -11,13 +11,33 @@
PHONY += clean distclean mostlyclean maintainer-clean uninstall
+define obj_clean
+clean::
+ @-rm -f $$($(1)_OBJ) $$($(1)_DEP)
+ @-rm -f $$($(1)_OBJ_DBG) $$($(1)_DEP_DBG)
+ @-rm -f $$($(1)_OBJ_STLDBG) $$($(1)_DEP_STLDBG)
+endef
+
clean::
@-rm -f core core.*
+ifdef PRGNAME
@-rm -f $(OBJ) $(DEP)
@-rm -f $(OBJ_DBG) $(DEP_DBG)
@-rm -f $(OBJ_STLDBG) $(DEP_STLDBG)
+endif
+ifdef LIBNAME
+ @-rm -f $(OBJ) $(DEP)
+ @-rm -f $(OBJ_DBG) $(DEP_DBG)
+ @-rm -f $(OBJ_STLDBG) $(DEP_STLDBG)
+endif
+$(foreach prg,$(PRGNAMES),$(eval $(call obj_clean,$(prg))))
+
+$(foreach prg,$(LIBNAMES),$(eval $(call obj_clean,$(prg))))
+
distclean:: clean
+# $(DEPENDS_COLLECTION) removed before directory,
+# see app/clean.mak and lib/clean.mak
mostlyclean: clean
@-rm -f $(DEPENDS_COLLECTION)
Modified: trunk/complement/explore/Makefiles/gmake/app/clean.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/clean.mak 2006-11-13 18:25:20 UTC (rev 1398)
+++ trunk/complement/explore/Makefiles/gmake/app/clean.mak 2006-11-17 07:46:32 UTC (rev 1399)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <06/11/11 00:43:13 ptr>
+# -*- makefile -*- Time-stamp: <06/11/17 00:29:39 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -9,16 +9,27 @@
# Licensed under the Academic Free License version 3.0
#
+define prog_clean
clean::
- @-rm -f ${PRG}
- @-rm -f ${PRG_DBG}
- @-rm -f ${PRG_STLDBG}
+ @rm -f $${$(1)_PRG} $${$(1)_PRG_DBG} $${$(1)_PRG_STLDBG}
+uninstall::
+ @rm -f $$(INSTALL_BIN_DIR)/$$($(1)_PRG) $$(INSTALL_BIN_DIR_DBG)/$$($(1)_PRG_DBG) $$(INSTALL_BIN_DIR_STLDBG)/$$($(1)_PRG_STLDBG)
+endef
+
+clean::
+ifdef PRGNAME
+ @-rm -f ${PRG} ${PRG_DBG} ${PRG_STLDBG}
+endif
+
+$(foreach prg,$(PRGNAMES),$(eval $(call prog_clean,$(prg))))
+
distclean::
@-rm -f $(DEPENDS_COLLECTION)
- @-rmdir -p ${OUTPUT_DIR} ${OUTPUT_DIR_DBG} ${OUTPUT_DIR_STLDBG} 2>/dev/null || exit 0
+ @-rmdir -p ${OUTPUT_DIR} ${OUTPUT_DIR_DBG} ${OUTPUT_DIR_STLDBG} 2>/dev/null
-uninstall:
- @-rm -f $(INSTALL_BIN_DIR)/$(PRG)
- @-rm -f $(INSTALL_BIN_DIR_DBG)/$(PRG_DBG)
- @-rm -f $(INSTALL_BIN_DIR_STLDBG)/$(PRG_STLDBG)
+uninstall::
+ifdef PRGNAME
+ @-rm -f $(INSTALL_BIN_DIR)/$(PRG) $(INSTALL_BIN_DIR_DBG)/$(PRG_DBG) $(INSTALL_BIN_DIR_STLDBG)/$(PRG_STLDBG)
+endif
+ @-rmdir -p $(INSTALL_BIN_DIR) $(INSTALL_BIN_DIR_DBG) $(INSTALL_BIN_DIR_STLDBG) 2>/dev/null
Modified: trunk/complement/explore/Makefiles/gmake/app/macro.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/macro.mak 2006-11-13 18:25:20 UTC (rev 1398)
+++ trunk/complement/explore/Makefiles/gmake/app/macro.mak 2006-11-17 07:46:32 UTC (rev 1399)
@@ -1,5 +1,30 @@
-# Time-stamp: <06/11/10 17:27:33 ptr>
+# Time-stamp: <06/11/16 23:37:38 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
+ALLPRGS =
+ALLPRGS_DBG =
+ALLPRGS_STLDBG =
+
+define prog_prog
+$(1)_PRG := $(OUTPUT_DIR)/$(1)${EXE}
+$(1)_PRG_DBG := $(OUTPUT_DIR_DBG)/$(1)${EXE}
+$(1)_PRG_STLDBG := $(OUTPUT_DIR_STLDBG)/$(1)${EXE}
+
+ALLPRGS += $${$(1)_PRG}
+ALLPRGS_DBG += $${$(1)_PRG_DBG}
+ALLPRGS_STLDBG += $${$(1)_PRG_STLDBG}
+endef
+
+$(foreach prg,$(PRGNAMES),$(eval $(call prog_prog,$(prg))))
+
PRG := $(OUTPUT_DIR)/${PRGNAME}${EXE}
PRG_DBG := $(OUTPUT_DIR_DBG)/${PRGNAME}${EXE}
PRG_STLDBG := $(OUTPUT_DIR_STLDBG)/${PRGNAME}${EXE}
Modified: trunk/complement/explore/Makefiles/gmake/app/rules-install.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/rules-install.mak 2006-11-13 18:25:20 UTC (rev 1398)
+++ trunk/complement/explore/Makefiles/gmake/app/rules-install.mak 2006-11-17 07:46:32 UTC (rev 1399)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <06/11/02 10:45:53 ptr>
+# -*- makefile -*- Time-stamp: <06/11/17 00:21:21 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -15,38 +15,49 @@
install: install-release-shared install-dbg-shared
endif
-# The program name to be installed will be the same as compiled name,
-# but it will be a bit altered in case of installation debug and/or
-# stlport-debug program in the same catalog as 'release' program.
+INSTALL_PRGNAME_CMD =
+INSTALL_PRGNAME_CMD_DBG =
+INSTALL_PRGNAME_CMD_STLDBG =
+define prog_install
+INSTALL_$(1)_PRGNAME := $(1)${EXE}
+INSTALL_PRGNAME_CMD += $$(INSTALL_EXE) $${$(1)_PRG} $$(INSTALL_BIN_DIR)/$${INSTALL_$(1)_PRGNAME}; \
+
+INSTALL_$(1)_PRGNAME_DBG := $${INSTALL_$(1)_PRGNAME}
+INSTALL_PRGNAME_CMD_DBG += $$(INSTALL_EXE) $${$(1)_PRG_DBG} $$(INSTALL_BIN_DIR_DBG)/$${INSTALL_$(1)_PRGNAME_DBG}; \
+
+ifndef WITHOUT_STLPORT
+INSTALL_$(1)_PRGNAME_STLDBG := $${INSTALL_$(1)_PRGNAME}
+INSTALL_PRGNAME_CMD_STLDBG += $$(INSTALL_EXE) $${$(1)_PRG_STLDBG} $$(INSTALL_BIN_DIR_STLDBG)/$${INSTALL_$(1)_PRGNAME_STLDBG}; \
+
+endif
+endef
+
INSTALL_PRGNAME := ${PRGNAME}${EXE}
+$(foreach prg,$(PRGNAMES),$(eval $(call prog_install,$(prg))))
-#ifeq (${INSTALL_BIN_DIR},${INSTALL_BIN_DIR_DBG})
-#INSTALL_PRGNAME_DBG := ${PRGNAME}g${EXE}
-#else
INSTALL_PRGNAME_DBG := ${INSTALL_PRGNAME}
-#endif
ifndef WITHOUT_STLPORT
-#ifeq (${INSTALL_BIN_DIR},${INSTALL_BIN_DIR_STLDBG})
-#INSTALL_PRGNAME_STLDBG := ${PRGNAME}stlg${EXE}
-#else
INSTALL_PRGNAME_STLDBG := ${INSTALL_PRGNAME}
-#endif
endif
-#ifeq (${INSTALL_BIN_DIR_DBG},${INSTALL_BIN_DIR_STLDBG})
-#INSTALL_PRGNAME_DBG := ${PRGNAME}g${EXE}
-#INSTALL_PRGNAME_STLDBG := ${PRGNAME}stlg${EXE}
-#endif
-
install-release-shared: release-shared $(INSTALL_BIN_DIR)
+ifdef PRGNAME
$(INSTALL_EXE) ${PRG} $(INSTALL_BIN_DIR)/${INSTALL_PRGNAME}
+endif
+ $(INSTALL_PRGNAME_CMD)
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)
ifndef WITHOUT_STLPORT
install-stldbg-shared: stldbg-shared $(INSTALL_BIN_DIR_STLDBG)
+ifdef PRGNAME
$(INSTALL_EXE) ${PRG_STLDBG} $(INSTALL_BIN_DIR_STLDBG)/${INSTALL_PRGNAME_STLDBG}
endif
+ $(INSTALL_PRGNAME_CMD_STLDBG)
+endif
Modified: trunk/complement/explore/Makefiles/gmake/app/rules.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/rules.mak 2006-11-13 18:25:20 UTC (rev 1398)
+++ trunk/complement/explore/Makefiles/gmake/app/rules.mak 2006-11-17 07:46:32 UTC (rev 1399)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <06/11/10 17:10:45 ptr>
+# -*- makefile -*- Time-stamp: <06/11/17 10:34:26 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -9,22 +9,49 @@
# Licensed under the Academic Free License version 3.0
#
-dbg-shared: $(EXTRA_PRE_DBG) $(OUTPUT_DIR_DBG) ${PRG_DBG} $(EXTRA_POST_DBG)
+dbg-shared: $(EXTRA_PRE_DBG) $(OUTPUT_DIR_DBG) ${PRG_DBG} ${ALLPRGS_DBG} $(EXTRA_POST_DBG)
-dbg-static: $(EXTRA_PRE_DBG) $(OUTPUT_DIR_DBG) ${PRG_DBG} $(EXTRA_POST_DBG)
+dbg-static: $(EXTRA_PRE_DBG) $(OUTPUT_DIR_DBG) ${PRG_DBG} ${ALLPRGS_DBG} $(EXTRA_POST_DBG)
-release-shared: $(EXTRA_PRE) $(OUTPUT_DIR) ${PRG} $(EXTRA_POST)
+release-shared: $(EXTRA_PRE) $(OUTPUT_DIR) ${PRG} ${ALLPRGS} $(EXTRA_POST)
-release-static: $(EXTRA_PRE) $(OUTPUT_DIR) ${PRG} $(EXTRA_POST)
+release-static: $(EXTRA_PRE) $(OUTPUT_DIR) ${PRG} ${ALLPRGS} $(EXTRA_POST)
ifndef WITHOUT_STLPORT
-stldbg-shared: $(EXTRA_PRE_STLDBG) $(OUTPUT_DIR_STLDBG) ${PRG_STLDBG} $(EXTRA_POST_STLDBG)
+stldbg-shared: $(EXTRA_PRE_STLDBG) $(OUTPUT_DIR_STLDBG) ${PRG_STLDBG} ${ALLPRGS_STLDBG} $(EXTRA_POST_STLDBG)
-stldbg-static: $(EXTRA_PRE_STLDBG) $(OUTPUT_DIR_STLDBG) ${PRG_STLDBG} $(EXTRA_POST_STLDBG)
+stldbg-static: $(EXTRA_PRE_STLDBG) $(OUTPUT_DIR_STLDBG) ${PRG_STLDBG} ${ALLPRGS_STLDBG} $(EXTRA_POST_STLDBG)
endif
+define prog_lnk
+ifeq ($${_$(1)_C_SOURCES_ONLY},)
+$${$(1)_PRG}: $$($(1)_OBJ) $$(LIBSDEP)
+ $$(LINK.cc) $$(LINK_OUTPUT_OPTION) $${START_OBJ} $$($(1)_OBJ) $$(LDLIBS) $${STDLIBS} $${END_OBJ}
+
+$${$(1)_PRG_DBG}: $$($(1)_OBJ_DBG) $$(LIBSDEP)
+ $$(LINK.cc) $$(LINK_OUTPUT_OPTION) $${START_OBJ} $$($(1)_OBJ_DBG) $$(LDLIBS) $${STDLIBS} $${END_OBJ}
+
+ifndef WITHOUT_STLPORT
+$${$(1)_PRG_STLDBG}: $$($(1)_OBJ_STLDBG) $$(LIBSDEP)
+ $$(LINK.cc) $$(LINK_OUTPUT_OPTION) $${START_OBJ} $$($(1)_OBJ_STLDBG) $$(LDLIBS) $${STDLIBS} $${END_OBJ}
+endif
+else
+$${$(1)_PRG}: $$($(1)_OBJ) $$(LIBSDEP)
+ $$(LINK.c) $$(LINK_OUTPUT_OPTION) $$($(1)_OBJ) $$(LDLIBS)
+
+$${$(1)_PRG_DBG}: $$(OBJ_DBG) $$(LIBSDEP)
+ $$(LINK.c) $$(LINK_OUTPUT_OPTION) $$($(1)_OBJ_DBG) $$(LDLIBS)
+
+ifndef WITHOUT_STLPORT
+$${$(1)_PRG_STLDBG}: $$($(1)_OBJ_STLDBG) $$(LIBSDEP)
+ $$(LINK.c) $$(LINK_OUTPUT_OPTION) $$($(1)_OBJ_STLDBG) $$(LDLIBS)
+endif
+endif
+endef
+
+$(foreach prg,$(PRGNAMES),$(eval $(call prog_lnk,$(prg))))
+
ifeq ("${_C_SOURCES_ONLY}","")
-
${PRG}: $(OBJ) $(LIBSDEP)
$(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ) $(LDLIBS) ${STDLIBS} ${END_OBJ}
@@ -35,9 +62,7 @@
${PRG_STLDBG}: $(OBJ_STLDBG) $(LIBSDEP)
$(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_STLDBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
endif
-
else
-
${PRG}: $(OBJ) $(LIBSDEP)
$(LINK.c) $(LINK_OUTPUT_OPTION) $(OBJ) $(LDLIBS)
@@ -48,5 +73,4 @@
${PRG_STLDBG}: $(OBJ_STLDBG) $(LIBSDEP)
$(LINK.c) $(LINK_OUTPUT_OPTION) $(OBJ_STLDBG) $(LDLIBS)
endif
-
endif
Modified: trunk/complement/explore/Makefiles/gmake/lib/clean.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/clean.mak 2006-11-13 18:25:20 UTC (rev 1398)
+++ trunk/complement/explore/Makefiles/gmake/lib/clean.mak 2006-11-17 07:46:32 UTC (rev 1399)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <06/11/11 00:43:08 ptr>
+# -*- makefile -*- Time-stamp: <06/11/17 00:39:31 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -9,7 +9,55 @@
# Licensed under the Academic Free License version 3.0
#
+define lib_clean
clean::
+ @-rm -f $${$(1)_SO_NAME_OUT}
+ @-rm -f $${$(1)_SO_NAME_OUTx}
+ @-rm -f $${$(1)_SO_NAME_OUTxx}
+ @-rm -f $${$(1)_SO_NAME_OUTxxx}
+ @-rm -f $${$(1)_SO_NAME_OUT_DBG}
+ @-rm -f $${$(1)_SO_NAME_OUT_DBGx}
+ @-rm -f $${$(1)_SO_NAME_OUT_DBGxx}
+ @-rm -f $${$(1)_SO_NAME_OUT_DBGxxx}
+ @-rm -f $${$(1)_SO_NAME_OUT_STLDBG}
+ @-rm -f $${$(1)_SO_NAME_OUT_STLDBGx}
+ @-rm -f $${$(1)_SO_NAME_OUT_STLDBGxx}
+ @-rm -f $${$(1)_SO_NAME_OUT_STLDBGxxx}
+ @-rm -f $${$(1)_A_NAME_OUT}
+ @-rm -f $${$(1)_A_NAME_OUT_DBG}
+ @-rm -f $${$(1)_A_NAME_OUT_STLDBG}
+ifeq ($(OSNAME), cygming)
+ @-rm -f $${$(1)_LIB_NAME_OUT}
+ @-rm -f $${$(1)_LIB_NAME_OUT_DBG}
+ @-rm -f $${$(1)_LIB_NAME_OUT_STLDBG}
+ @-rm -f $${$(1)_RES}
+ @-rm -f $${$(1)_RES_DBG}
+ @-rm -f $${$(1)_RES_STLDBG}
+endif
+
+uninstall::
+ @-rm -f $$(INSTALL_LIB_DIR)/$$($(1)_SO_NAME)
+ @-rm -f $$(INSTALL_LIB_DIR)/$$($(1)_SO_NAMEx)
+ @-rm -f $$(INSTALL_LIB_DIR)/$$($(1)_SO_NAMExx)
+ @-rm -f $$(INSTALL_LIB_DIR)/$$($(1)_SO_NAMExxx)
+ @-rm -f $$(INSTALL_LIB_DIR_DBG)/$$($(1)_SO_NAME_DBG)
+ @-rm -f $$(INSTALL_LIB_DIR_DBG)/$$($(1)_SO_NAME_DBGx)
+ @-rm -f $$(INSTALL_LIB_DIR_DBG)/$$($(1)_SO_NAME_DBGxx)
+ @-rm -f $$(INSTALL_LIB_DIR_DBG)/$$($(1)_SO_NAME_DBGxxx)
+ @-rm -f $$(INSTALL_LIB_DIR_STLDBG)/$$($(1)_SO_NAME_STLDBG)
+ @-rm -f $$(INSTALL_LIB_DIR_STLDBG)/$$($(1)_SO_NAME_STLDBGx)
+ @-rm -f $$(INSTALL_LIB_DIR_STLDBG)/$$($(1)_SO_NAME_STLDBGxx)
+ @-rm -f $$(INSTALL_LIB_DIR_STLDBG)/$$($(1)_SO_NAME_STLDBGxxx)
+ @-rm -f $$(INSTALL_LIB_DIR)/$${$(1)_A_NAME_OUT}
+ @-rm -f $$(INSTALL_LIB_DIR_DBG)/$${$(1)_A_NAME_OUT_DBG}
+ @-rm -f $$(INSTALL_LIB_DIR_STLDBG)/$${$(1)_A_NAME_OUT_STLDBG}
+ @-rmdir -p $$(INSTALL_LIB_DIR) $$(INSTALL_LIB_DIR_DBG) $$(INSTALL_LIB_DIR_STLDBG) 2>/dev/null
+endef
+
+$(foreach nm,$(LIBNAMES),$(eval $(call lib_clean,$(nm))))
+
+clean::
+ifdef LIBNAME
@-rm -f ${SO_NAME_OUT}
@-rm -f ${SO_NAME_OUTx}
@-rm -f ${SO_NAME_OUTxx}
@@ -33,12 +81,14 @@
@-rm -f ${RES_DBG}
@-rm -f ${RES_STLDBG}
endif
+endif
distclean::
@-rm -f $(DEPENDS_COLLECTION)
- @-rmdir -p ${OUTPUT_DIR} ${OUTPUT_DIR_DBG} ${OUTPUT_DIR_STLDBG} 2>/dev/null || exit 0
+ @-rmdir -p ${OUTPUT_DIR} ${OUTPUT_DIR_DBG} ${OUTPUT_DIR_STLDBG} 2>/dev/null
-uninstall:
+uninstall::
+ifdef LIBNAME
@-rm -f $(INSTALL_LIB_DIR)/$(SO_NAME)
@-rm -f $(INSTALL_LIB_DIR)/$(SO_NAMEx)
@-rm -f $(INSTALL_LIB_DIR)/$(SO_NAMExx)
@@ -54,5 +104,6 @@
@-rm -f $(INSTALL_LIB_DIR)/${A_NAME_OUT}
@-rm -f $(INSTALL_LIB_DIR_DBG)/${A_NAME_OUT_DBG}
@-rm -f $(INSTALL_LIB_DIR_STLDBG)/${A_NAME_OUT_STLDBG}
- @-rmdir -p $(INSTALL_LIB_DIR) $(INSTALL_LIB_DIR_DBG) $(INSTALL_LIB_DIR_STLDBG) 2>/dev/null || exit 0
+endif
+ @-rmdir -p $(INSTALL_LIB_DIR) $(INSTALL_LIB_DIR_DBG) $(INSTALL_LIB_DIR_STLDBG) 2>/dev/null
Modified: trunk/complement/explore/Makefiles/gmake/targets.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/targets.mak 2006-11-13 18:25:20 UTC (rev 1398)
+++ trunk/complement/explore/Makefiles/gmake/targets.mak 2006-11-17 07:46:32 UTC (rev 1399)
@@ -1,4 +1,4 @@
-# Time-stamp: <06/11/03 12:09:39 ptr>
+# Time-stamp: <06/11/17 10:29:59 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -9,6 +9,34 @@
# Licensed under the Academic Free License version 3.0
#
+PRGS_DIR_SRC =
+define prog_
+PRGS_DIR_SRC += $$(dir $${$(1)_SRC_CPP} $${$(1)_SRC_CC} $${$(1)_SRC_CXX} $${$(1)_SRC_C} $${$(1)_SRC_S} )
+$(1)_ALLBASE := $$(basename $$(notdir $${$(1)_SRC_CC} $${$(1)_SRC_CPP} $${$(1)_SRC_CXX} $${$(1)_SRC_C} $${$(1)_SRC_S} ) )
+$(1)_ALLOBJS := $$(addsuffix .o,$${$(1)_ALLBASE})
+$(1)_ALLDEPS := $$(addsuffix .d,$${$(1)_ALLBASE})
+
+$(1)_OBJ := $$(addprefix $$(OUTPUT_DIR)/,$${$(1)_ALLOBJS})
+$(1)_OBJ_DBG := $$(addprefix $$(OUTPUT_DIR_DBG)/,$${$(1)_ALLOBJS})
+$(1)_OBJ_STLDBG := $$(addprefix $$(OUTPUT_DIR_STLDBG)/,$${$(1)_ALLOBJS})
+
+$(1)_DEP := $$(addprefix $$(OUTPUT_DIR)/,$${$(1)_ALLDEPS})
+$(1)_DEP_DBG := $$(addprefix $$(OUTPUT_DIR_DBG)/,$${$(1)_ALLDEPS})
+$(1)_DEP_STLDBG := $$(addprefix $$(OUTPUT_DIR_STLDBG)/,$${$(1)_ALLDEPS})
+
+$(1)_RES := $$(addprefix $$(OUTPUT_DIR)/,$${$(1)_ALLRESS})
+$(1)_RES_DBG := $$(addprefix $$(OUTPUT_DIR_DBG)/,$${$(1)_ALLRESS})
+$(1)_RES_STLDBG := $$(addprefix $$(OUTPUT_DIR_STLDBG)/,$${$(1)_ALLRESS})
+
+ifeq ("$$(sort $${$(1)_SRC_CC} $${$(1)_SRC_CPP} $${$(1)_SRC_CXX})","")
+$(1)_NOT_USE_NOSTDLIB := 1
+_$(1)_C_SOURCES_ONLY := true
+endif
+
+endef
+
+$(foreach prg,$(PRGNAMES),$(eval $(call prog_,$(prg))))
+
# If we have no C++ sources, let's use C compiler for linkage instead of C++.
ifeq ("$(sort ${SRC_CC} ${SRC_CPP} ${SRC_CXX})","")
NOT_USE_NOSTDLIB := 1
@@ -21,7 +49,7 @@
ifeq (${OSNAME},cygming)
DIRS_UNIQUE_SRC := ${DIRS_UNIQUE_SRC} $(dir $(SRC_RC) )
endif
-DIRS_UNIQUE_SRC := $(sort $(DIRS_UNIQUE_SRC) )
+DIRS_UNIQUE_SRC := $(sort $(DIRS_UNIQUE_SRC) $(PRGS_DIR_SRC))
# The rules below may be even simpler (i.e. define macro that generate
# rules for COMPILE.xx), but this GNU make 3.80 unhappy with it;
@@ -139,4 +167,3 @@
DEP_A_STLDBG := $(addprefix $(OUTPUT_DIR_A_STLDBG)/,$(ALLDEPS))
endif
-
Modified: trunk/complement/explore/Makefiles/top.mak
===================================================================
--- trunk/complement/explore/Makefiles/top.mak 2006-11-13 18:25:20 UTC (rev 1398)
+++ trunk/complement/explore/Makefiles/top.mak 2006-11-17 07:46:32 UTC (rev 1399)
@@ -111,4 +111,8 @@
include ${RULESBASE}/$(USE_MAKE)/app/top.mak
endif
+ifdef PRGNAMES
+# include ${RULESBASE}/$(USE_MAKE)/app/top.mak
+endif
+
.PHONY: $(PHONY)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2006-12-12 08:21:50
|
Revision: 1442
http://svn.sourceforge.net/complement/?rev=1442&view=rev
Author: complement
Date: 2006-12-12 00:21:49 -0800 (Tue, 12 Dec 2006)
Log Message:
-----------
unit tests for make system
Added Paths:
-----------
trunk/complement/explore/Makefiles/ut/
trunk/complement/explore/Makefiles/ut/so1/
trunk/complement/explore/Makefiles/ut/so1/Makefile
trunk/complement/explore/Makefiles/ut/so1/Makefile.inc
trunk/complement/explore/Makefiles/ut/so1/test_c.cc
trunk/complement/explore/Makefiles/ut/so1/test_cc.cc
Property changes on: trunk/complement/explore/Makefiles/ut/so1
___________________________________________________________________
Name: svn:ignore
+ obj
Added: trunk/complement/explore/Makefiles/ut/so1/Makefile
===================================================================
--- trunk/complement/explore/Makefiles/ut/so1/Makefile (rev 0)
+++ trunk/complement/explore/Makefiles/ut/so1/Makefile 2006-12-12 08:21:49 UTC (rev 1442)
@@ -0,0 +1,18 @@
+# -*- Makefile -*- Time-stamp: <06/11/10 16:23:01 ptr>
+
+SRCROOT := ../../..
+EXTRA_POST := checks
+
+include Makefile.inc
+include ${SRCROOT}/Makefiles/top.mak
+
+INCLUDES += -I./include
+
+checks:
+ file ${SO_NAME_OUTxxx} | grep ELF >/dev/null || exit 1
+ file ${SO_NAME_OUTxx} | grep link >/dev/null || exit 1
+ file ${SO_NAME_OUTx} | grep link >/dev/null || exit 1
+ file ${SO_NAME_OUT} | grep link >/dev/null || exit 1
+
+PHONY += checks
+
Added: trunk/complement/explore/Makefiles/ut/so1/Makefile.inc
===================================================================
--- trunk/complement/explore/Makefiles/ut/so1/Makefile.inc (rev 0)
+++ trunk/complement/explore/Makefiles/ut/so1/Makefile.inc 2006-12-12 08:21:49 UTC (rev 1442)
@@ -0,0 +1,8 @@
+# -*- Makefile -*- Time-stamp: <06/11/29 01:59:50 ptr>
+
+LIBNAME = test
+MAJOR = 0
+MINOR = 1
+PATCH = 2
+SRC_CC = test_cc.cc
+SRC_C = test_c.c
Added: trunk/complement/explore/Makefiles/ut/so1/test_c.cc
===================================================================
--- trunk/complement/explore/Makefiles/ut/so1/test_c.cc (rev 0)
+++ trunk/complement/explore/Makefiles/ut/so1/test_c.cc 2006-12-12 08:21:49 UTC (rev 1442)
@@ -0,0 +1,4 @@
+int g()
+{
+ return 0;
+}
Added: trunk/complement/explore/Makefiles/ut/so1/test_cc.cc
===================================================================
--- trunk/complement/explore/Makefiles/ut/so1/test_cc.cc (rev 0)
+++ trunk/complement/explore/Makefiles/ut/so1/test_cc.cc 2006-12-12 08:21:49 UTC (rev 1442)
@@ -0,0 +1,4 @@
+int f()
+{
+ return 0;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2006-12-12 08:22:58
|
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.
|
|
From: <com...@us...> - 2007-01-31 11:45:25
|
Revision: 1490
http://svn.sourceforge.net/complement/?rev=1490&view=rev
Author: complement
Date: 2007-01-31 03:45:23 -0800 (Wed, 31 Jan 2007)
Log Message:
-----------
PRGNAME may be omitted, if PRGNAMES present
Modified Paths:
--------------
trunk/complement/explore/Makefiles/gmake/app/macro.mak
trunk/complement/explore/Makefiles/top.mak
Added Paths:
-----------
trunk/complement/explore/Makefiles/ut/app2-mult/
trunk/complement/explore/Makefiles/ut/app2-mult/Makefile
trunk/complement/explore/Makefiles/ut/app2-mult/Makefile.inc
trunk/complement/explore/Makefiles/ut/app2-mult/test2.cc
trunk/complement/explore/Makefiles/ut/app2-mult/test3.cc
trunk/complement/explore/Makefiles/ut/app2-mult/test31.cc
Modified: trunk/complement/explore/Makefiles/gmake/app/macro.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/macro.mak 2007-01-31 08:03:15 UTC (rev 1489)
+++ trunk/complement/explore/Makefiles/gmake/app/macro.mak 2007-01-31 11:45:23 UTC (rev 1490)
@@ -1,6 +1,6 @@
# Time-stamp: <06/11/16 23:37:38 ptr>
#
-# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
# Petr Ovtchenkov
#
# Portion Copyright (c) 1999-2001
@@ -9,10 +9,16 @@
# Licensed under the Academic Free License version 3.0
#
-ALLPRGS =
-ALLPRGS_DBG =
-ALLPRGS_STLDBG =
+ifdef PRGNAME
+PRG := $(OUTPUT_DIR)/${PRGNAME}${EXE}
+PRG_DBG := $(OUTPUT_DIR_DBG)/${PRGNAME}${EXE}
+PRG_STLDBG := $(OUTPUT_DIR_STLDBG)/${PRGNAME}${EXE}
+endif
+ALLPRGS = ${PRG}
+ALLPRGS_DBG = ${PRG_DBG}
+ALLPRGS_STLDBG = ${PRG_STLDBG}
+
define prog_prog
$(1)_PRG := $(OUTPUT_DIR)/$(1)${EXE}
$(1)_PRG_DBG := $(OUTPUT_DIR_DBG)/$(1)${EXE}
@@ -25,8 +31,4 @@
$(foreach prg,$(PRGNAMES),$(eval $(call prog_prog,$(prg))))
-PRG := $(OUTPUT_DIR)/${PRGNAME}${EXE}
-PRG_DBG := $(OUTPUT_DIR_DBG)/${PRGNAME}${EXE}
-PRG_STLDBG := $(OUTPUT_DIR_STLDBG)/${PRGNAME}${EXE}
-
LDFLAGS += ${LDSEARCH}
Modified: trunk/complement/explore/Makefiles/top.mak
===================================================================
--- trunk/complement/explore/Makefiles/top.mak 2007-01-31 08:03:15 UTC (rev 1489)
+++ trunk/complement/explore/Makefiles/top.mak 2007-01-31 11:45:23 UTC (rev 1490)
@@ -109,10 +109,10 @@
# if target is program, rules for executable
ifdef PRGNAME
include ${RULESBASE}/$(USE_MAKE)/app/top.mak
-endif
-
+else
ifdef PRGNAMES
-# include ${RULESBASE}/$(USE_MAKE)/app/top.mak
+include ${RULESBASE}/$(USE_MAKE)/app/top.mak
endif
+endif
.PHONY: $(PHONY)
Property changes on: trunk/complement/explore/Makefiles/ut/app2-mult
___________________________________________________________________
Name: svn:ignore
+ obj
Added: trunk/complement/explore/Makefiles/ut/app2-mult/Makefile
===================================================================
--- trunk/complement/explore/Makefiles/ut/app2-mult/Makefile (rev 0)
+++ trunk/complement/explore/Makefiles/ut/app2-mult/Makefile 2007-01-31 11:45:23 UTC (rev 1490)
@@ -0,0 +1,38 @@
+# -*- Makefile -*- Time-stamp: <06/11/13 23:03:45 ptr>
+
+SRCROOT := ../../..
+
+# EXTRA_POST := check-release-shared
+# EXTRA_POST_DBG := check-dbg-shared
+# EXTRA_POST_STLDBG := check-stldbg-shared
+
+include Makefile.inc
+include ${SRCROOT}/Makefiles/top.mak
+
+ifndef WITHOUT_STLPORT
+LDFLAGS += -Wl,-rpath=${STLPORT_LIB_DIR}
+endif
+
+check: check-release-shared check-dbg-shared check-stldbg-shared
+
+check-release-shared: release-shared
+ @echo Running 2 test cases...
+ @file ${test2_PRG} | grep ELF >/dev/null || exit 1
+ @file ${test3_PRG} | grep ELF >/dev/null || exit 1
+ @echo "*** No errors detected"
+
+check-dbg-shared: dbg-shared
+ @echo Running 2 test cases...
+ @file ${test2_PRG_DBG} | grep ELF >/dev/null || exit 1
+ @file ${test3_PRG_DBG} | grep ELF >/dev/null || exit 1
+ @echo "*** No errors detected"
+
+ifndef WITHOUT_STLPORT
+check-stldbg-shared: stldbg-shared
+ @echo Running 2 test cases...
+ @file ${test2_PRG_STLDBG} | grep ELF >/dev/null || exit 1
+ @file ${test3_PRG_STLDBG} | grep ELF >/dev/null || exit 1
+ @echo "*** No errors detected"
+endif
+
+PHONY += check check-release-shared check-dbg-shared check-stldbg-shared
Added: trunk/complement/explore/Makefiles/ut/app2-mult/Makefile.inc
===================================================================
--- trunk/complement/explore/Makefiles/ut/app2-mult/Makefile.inc (rev 0)
+++ trunk/complement/explore/Makefiles/ut/app2-mult/Makefile.inc 2007-01-31 11:45:23 UTC (rev 1490)
@@ -0,0 +1,7 @@
+# -*- makefile -*- Time-stamp: <04/01/12 15:37:40 ptr>
+
+PRGNAMES = test2 test3
+#SRC_C = test.c
+SRC_CC = test.cc
+test2_SRC_CC = test2.cc
+test3_SRC_CC = test3.cc test31.cc
Added: trunk/complement/explore/Makefiles/ut/app2-mult/test2.cc
===================================================================
--- trunk/complement/explore/Makefiles/ut/app2-mult/test2.cc (rev 0)
+++ trunk/complement/explore/Makefiles/ut/app2-mult/test2.cc 2007-01-31 11:45:23 UTC (rev 1490)
@@ -0,0 +1,4 @@
+int main()
+{
+ return 2;
+}
Added: trunk/complement/explore/Makefiles/ut/app2-mult/test3.cc
===================================================================
--- trunk/complement/explore/Makefiles/ut/app2-mult/test3.cc (rev 0)
+++ trunk/complement/explore/Makefiles/ut/app2-mult/test3.cc 2007-01-31 11:45:23 UTC (rev 1490)
@@ -0,0 +1,4 @@
+int main()
+{
+ return 3;
+}
Added: trunk/complement/explore/Makefiles/ut/app2-mult/test31.cc
===================================================================
--- trunk/complement/explore/Makefiles/ut/app2-mult/test31.cc (rev 0)
+++ trunk/complement/explore/Makefiles/ut/app2-mult/test31.cc 2007-01-31 11:45:23 UTC (rev 1490)
@@ -0,0 +1,4 @@
+int f()
+{
+ return 3;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-02-28 17:22:02
|
Revision: 1540
http://svn.sourceforge.net/complement/?rev=1540&view=rev
Author: complement
Date: 2007-02-28 09:21:00 -0800 (Wed, 28 Feb 2007)
Log Message:
-----------
group POSIX-like behaviour into 'unix'
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
Added Paths:
-----------
trunk/complement/explore/Makefiles/gmake/windows/rules-so.mak
Removed Paths:
-------------
trunk/complement/explore/Makefiles/gmake/cygming/rules-so.mak
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2007-02-28 17:15:33 UTC (rev 1539)
+++ trunk/complement/explore/Makefiles/ChangeLog 2007-02-28 17:21:00 UTC (rev 1540)
@@ -1,3 +1,9 @@
+2007-02-28 Petr Ovtchenkov <pt...@is...>
+
+ * gmake/OSNAME, gmake/lib: group similar platforms into 'unix';
+ in OSNAME now only really platform-specific defs---mainly for windows,
+ but sumtimes darwin.
+
2006-11-17 Petr Ovtchenkov <pt...@is...>
* gmake/app/rules.mak, rules-install.mak, macro.mak, clean.mak:
Deleted: trunk/complement/explore/Makefiles/gmake/cygming/rules-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/cygming/rules-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
+++ trunk/complement/explore/Makefiles/gmake/cygming/rules-so.mak 2007-02-28 17:21:00 UTC (rev 1540)
@@ -1,22 +0,0 @@
-# -*- makefile -*- Time-stamp: <03/10/27 18:15:05 ptr>
-# $Id$
-
-# Shared libraries tags
-
-PHONY += release-shared dbg-shared stldbg-shared
-
-release-shared: $(OUTPUT_DIR) ${SO_NAME_OUT}
-
-dbg-shared: $(OUTPUT_DIR_DBG) ${SO_NAME_OUT_DBG}
-
-stldbg-shared: $(OUTPUT_DIR_STLDBG) ${SO_NAME_OUT_STLDBG}
-
-${SO_NAME_OUT}: $(OBJ) $(RES) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) $(OBJ) $(RES) $(LDLIBS)
-
-${SO_NAME_OUT_DBG}: $(OBJ_DBG) $(RES_DBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) $(OBJ_DBG) $(RES_DBG) $(LDLIBS)
-
-${SO_NAME_OUT_STLDBG}: $(OBJ_STLDBG) $(RES_STLDBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) $(OBJ_STLDBG) $(RES_STLDBG) $(LDLIBS)
-
Copied: trunk/complement/explore/Makefiles/gmake/windows/rules-so.mak (from rev 1535, trunk/complement/explore/Makefiles/gmake/cygming/rules-so.mak)
===================================================================
--- trunk/complement/explore/Makefiles/gmake/windows/rules-so.mak (rev 0)
+++ trunk/complement/explore/Makefiles/gmake/windows/rules-so.mak 2007-02-28 17:21:00 UTC (rev 1540)
@@ -0,0 +1,97 @@
+# -*- makefile -*- Time-stamp: <03/10/27 18:15:05 ptr>
+# $Id$
+
+# Shared libraries tags
+
+PHONY += release-shared dbg-shared stldbg-shared
+
+release-shared: $(OUTPUT_DIR) ${SO_NAME_OUT}
+
+dbg-shared: $(OUTPUT_DIR_DBG) ${SO_NAME_OUT_DBG}
+
+stldbg-shared: $(OUTPUT_DIR_STLDBG) ${SO_NAME_OUT_STLDBG}
+
+ifeq (bcc, $(COMPILER_NAME))
+# Borland linker
+${SO_NAME_OUT}: $(OBJ) $(RES) $(LIBSDEP)
+ $(LINK.cc) $(subst /,\,$(START_OBJ) $(OBJ) $(END_OBJ), $(LINK_OUTPUT_OPTION), , $(LDLIBS), , $(RES))
+${SO_NAME_OUT_DBG}: $(OBJ_DBG) $(RES_DBG) $(LIBSDEP)
+ $(LINK.cc) $(subst /,\,$(START_OBJ) $(OBJ_DBG) $(END_OBJ), $(LINK_OUTPUT_OPTION), , $(LDLIBS), , $(RES_DBG))
+${SO_NAME_OUT_STLDBG}: $(OBJ_STLDBG) $(RES_STLDBG) $(LIBSDEP)
+ $(LINK.cc) $(subst /,\,$(START_OBJ) $(OBJ_STLDBG) $(END_OBJ), $(LINK_OUTPUT_OPTION), , $(LDLIBS), , $(RES_STLDBG))
+else
+ifeq (dmc, $(COMPILER_NAME))
+# Digital Mars linker
+# This linker generate the dll file even if link fail so we also use a
+# dependency on the lib file.
+
+$(SO_NAME_OUT): $(LIB_NAME_OUT)
+ $(LINK.cc) $(subst /,\,$(OBJ),$(LINK_OUTPUT_OPTION),$(MAP_OUTPUT_OPTION),$(LDLIBS),$(DEF_OPTION),$(RES))
+$(LIB_NAME_OUT): $(OBJ) $(RES) $(LIBSDEP)
+ @echo LIBRARY "$(SO_NAME_BASE).dll" > $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo DESCRIPTION 'STLport DLL for Digital Mars C/C++'>> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo EXETYPE NT>> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo SUBSYSTEM WINDOWS>> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo CODE SHARED EXECUTE>> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo DATA READWRITE>> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo.>> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo EXPORTS>> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo "?cin@std@@3V?$$basic_istream@std@DV?$$char_traits@std@D@1@@1@A">> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo "?cout@std@@3V?$$basic_ostream@std@DV?$$char_traits@std@D@1@@1@A">> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo "?cerr@std@@3V?$$basic_ostream@std@DV?$$char_traits@std@D@1@@1@A">> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo "?clog@std@@3V?$$basic_ostream@std@DV?$$char_traits@std@D@1@@1@A">> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo "?wcin@std@@3V?$$basic_istream@std@_YV?$$char_traits@std@_Y@1@@1@A">> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo "?wcout@std@@3V?$$basic_ostream@std@_YV?$$char_traits@std@_Y@1@@1@A">> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo "?wcerr@std@@3V?$$basic_ostream@std@_YV?$$char_traits@std@_Y@1@@1@A">> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo "?wclog@std@@3V?$$basic_ostream@std@_YV?$$char_traits@std@_Y@1@@1@A">> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+
+$(SO_NAME_OUT_DBG): $(LIB_NAME_OUT_DBG)
+ $(LINK.cc) $(subst /,\,$(OBJ_DBG), $(LINK_OUTPUT_OPTION), $(MAP_OUTPUT_OPTION), $(LDLIBS), $(DEF_OPTION_DBG), $(RES_DBG))
+$(LIB_NAME_OUT_DBG): $(OBJ_DBG) $(RES_DBG) $(LIBSDEP)
+ @echo LIBRARY "$(SO_NAME_DBG_BASE).dll" > $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo DESCRIPTION 'STLport DLL for Digital Mars C/C++'>> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo EXETYPE NT>> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo SUBSYSTEM WINDOWS>> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo CODE SHARED EXECUTE>> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo DATA READWRITE>> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo.>> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo EXPORTS>> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo "?cin@std@@3V?$$basic_istream@std@DV?$$char_traits@std@D@1@@1@A">> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo "?cout@std@@3V?$$basic_ostream@std@DV?$$char_traits@std@D@1@@1@A">> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo "?cerr@std@@3V?$$basic_ostream@std@DV?$$char_traits@std@D@1@@1@A">> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo "?clog@std@@3V?$$basic_ostream@std@DV?$$char_traits@std@D@1@@1@A">> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo "?wcin@std@@3V?$$basic_istream@std@_YV?$$char_traits@std@_Y@1@@1@A">> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo "?wcout@std@@3V?$$basic_ostream@std@_YV?$$char_traits@std@_Y@1@@1@A">> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo "?wcerr@std@@3V?$$basic_ostream@std@_YV?$$char_traits@std@_Y@1@@1@A">> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo "?wclog@std@@3V?$$basic_ostream@std@_YV?$$char_traits@std@_Y@1@@1@A">> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+
+$(SO_NAME_OUT_STLDBG): $(LIB_NAME_OUT_STLDBG)
+ $(LINK.cc) $(subst /,\,$(OBJ_STLDBG), $(LINK_OUTPUT_OPTION), $(MAP_OUTPUT_OPTION), $(LDLIBS), $(DEF_OPTION_STLDBG), $(RES_STLDBG))
+$(LIB_NAME_OUT_STLDBG): $(OBJ_STLDBG) $(RES_STLDBG) $(LIBSDEP)
+ @echo LIBRARY "$(SO_NAME_STLDBG_BASE).dll" > $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo DESCRIPTION 'STLport DLL for Digital Mars C/C++'>> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo EXETYPE NT>> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo SUBSYSTEM WINDOWS>> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo CODE SHARED EXECUTE>> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo DATA READWRITE>> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo.>> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo EXPORTS>> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo "?cin@std@@3V?$$basic_istream@std@DV?$$char_traits@std@D@1@@1@A">> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo "?cout@std@@3V?$$basic_ostream@std@DV?$$char_traits@std@D@1@@1@A">> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo "?cerr@std@@3V?$$basic_ostream@std@DV?$$char_traits@std@D@1@@1@A">> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo "?clog@std@@3V?$$basic_ostream@std@DV?$$char_traits@std@D@1@@1@A">> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo "?wcin@std@@3V?$$basic_istream@std@_YV?$$char_traits@std@_Y@1@@1@A">> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo "?wcout@std@@3V?$$basic_ostream@std@_YV?$$char_traits@std@_Y@1@@1@A">> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo "?wcerr@std@@3V?$$basic_ostream@std@_YV?$$char_traits@std@_Y@1@@1@A">> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo "?wclog@std@@3V?$$basic_ostream@std@_YV?$$char_traits@std@_Y@1@@1@A">> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+
+else
+# GNU linker
+${SO_NAME_OUT}: $(OBJ) $(RES) $(LIBSDEP)
+ $(LINK.cc) $(LINK_OUTPUT_OPTION) $(OBJ) $(RES) $(LDLIBS)
+${SO_NAME_OUT_DBG}: $(OBJ_DBG) $(RES_DBG) $(LIBSDEP)
+ $(LINK.cc) $(LINK_OUTPUT_OPTION) $(OBJ_DBG) $(RES_DBG) $(LDLIBS)
+${SO_NAME_OUT_STLDBG}: $(OBJ_STLDBG) $(RES_STLDBG) $(LIBSDEP)
+ $(LINK.cc) $(LINK_OUTPUT_OPTION) $(OBJ_STLDBG) $(RES_STLDBG) $(LDLIBS)
+endif
+endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-03-08 20:55:52
|
Revision: 1551
http://svn.sourceforge.net/complement/?rev=1551&view=rev
Author: complement
Date: 2007-03-08 12:55:48 -0800 (Thu, 08 Mar 2007)
Log Message:
-----------
make.mak: removed, make except GNU make can't work due to top.mak;
USE_MAKE went to top.mak;
top.mak: use single extern.mak, intead of gmake/OSNAME/extern.mak
gmake/OSNAME/extern.mak: removed;
gmake/...: add copyright notice in many files;
gmake/app/macro.mak: removed, code went to gmake/app/top.mak;
gmake/app/top.mak: code from gmake/app/macro.mak;
gmake/app/gcc.mak: remove bashism;
gmake/lib/gcc.mak: ditto.
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
trunk/complement/explore/Makefiles/gmake/app/CC.mak
trunk/complement/explore/Makefiles/gmake/app/aCC.mak
trunk/complement/explore/Makefiles/gmake/app/gcc.mak
trunk/complement/explore/Makefiles/gmake/app/icc.mak
trunk/complement/explore/Makefiles/gmake/app/top.mak
trunk/complement/explore/Makefiles/gmake/darwin/sys.mak
trunk/complement/explore/Makefiles/gmake/darwin/targetsys.mak
trunk/complement/explore/Makefiles/gmake/freebsd/sys.mak
trunk/complement/explore/Makefiles/gmake/freebsd/targetsys.mak
trunk/complement/explore/Makefiles/gmake/icc.mak
trunk/complement/explore/Makefiles/gmake/lib/CC.mak
trunk/complement/explore/Makefiles/gmake/lib/aCC.mak
trunk/complement/explore/Makefiles/gmake/lib/gcc.mak
trunk/complement/explore/Makefiles/gmake/lib/icc.mak
trunk/complement/explore/Makefiles/gmake/lib/rules-a.mak
trunk/complement/explore/Makefiles/gmake/lib/vc6.mak
trunk/complement/explore/Makefiles/gmake/linux/targetsys.mak
trunk/complement/explore/Makefiles/gmake/sunos/sys.mak
trunk/complement/explore/Makefiles/gmake/sunos/targetsys.mak
trunk/complement/explore/Makefiles/gmake/sysid.mak
trunk/complement/explore/Makefiles/gmake/vc6.mak
trunk/complement/explore/Makefiles/top.mak
Added Paths:
-----------
trunk/complement/explore/Makefiles/extern.mak
Removed Paths:
-------------
trunk/complement/explore/Makefiles/gmake/app/clean.mak
trunk/complement/explore/Makefiles/gmake/app/macro.mak
trunk/complement/explore/Makefiles/gmake/cygming/extern.mak
trunk/complement/explore/Makefiles/gmake/darwin/extern.mak
trunk/complement/explore/Makefiles/gmake/freebsd/extern.mak
trunk/complement/explore/Makefiles/gmake/hp-ux/extern.mak
trunk/complement/explore/Makefiles/gmake/lib/mwccnlm.mak
trunk/complement/explore/Makefiles/gmake/linux/extern.mak
trunk/complement/explore/Makefiles/gmake/openbsd/extern.mak
trunk/complement/explore/Makefiles/gmake/sunos/extern.mak
trunk/complement/explore/Makefiles/gmake/windows/extern.mak
trunk/complement/explore/Makefiles/make.mak
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/ChangeLog 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,3 +1,23 @@
+2007-03-08 Petr Ovtchenkov <pt...@is...>
+
+ * make.mak: removed, make except GNU make can't work due to top.mak;
+ USE_MAKE went to top.mak;
+
+ * top.mak: use single extern.mak, intead of gmake/OSNAME/extern.mak
+
+ * gmake/OSNAME/extern.mak: removed;
+
+ * gmake/...: add copyright notice in many files;
+
+ * gmake/app/macro.mak: removed, code went to gmake/app/top.mak;
+
+ * gmake/app/top.mak: code from gmake/app/macro.mak;
+
+ * gmake/app/gcc.mak: remove bashism;
+
+ * gmake/lib/gcc.mak: ditto.
+
+
2007-02-28 Petr Ovtchenkov <pt...@is...>
* gmake/OSNAME, gmake/lib: group similar platforms into 'unix';
Added: trunk/complement/explore/Makefiles/extern.mak
===================================================================
--- trunk/complement/explore/Makefiles/extern.mak (rev 0)
+++ trunk/complement/explore/Makefiles/extern.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -0,0 +1,40 @@
+# Time-stamp: <07/03/08 22:41:26 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
+
+# Complement project:
+
+CoMT_DIR ?= ${SRCROOT}
+
+CoMT_LIB_DIR ?= ${INSTALL_LIB_DIR}
+CoMT_LIB_DIR_DBG ?= ${INSTALL_LIB_DIR_DBG}
+CoMT_LIB_DIR_STLDBG ?= ${INSTALL_LIB_DIR_STLDBG}
+CoMT_BIN_DIR ?= ${INSTALL_BIN_DIR}
+CoMT_BIN_DIR_DBG ?= ${INSTALL_BIN_DIR_DBG}
+CoMT_BIN_DIR_STLDBG ?= ${INSTALL_BIN_DIR_STLDBG}
+
+CoMT_INCLUDE_DIR ?= ${CoMT_DIR}/include
+
+# boost (http://www.boost.org, http://boost.sourceforge.net)
+
+ifdef BOOST_DIR
+BOOST_INCLUDE_DIR ?= ${BOOST_DIR}
+endif
+
+# STLport library
+
+ifndef WITHOUT_STLPORT
+STLPORT_DIR ?= ${HOME}/STLport.lab/STLport
+endif
+
+ifdef STLPORT_DIR
+STLPORT_LIB_DIR ?= $(STLPORT_DIR)/${TARGET_NAME}lib
+STLPORT_INCLUDE_DIR ?= $(STLPORT_DIR)/stlport
+endif
Modified: trunk/complement/explore/Makefiles/gmake/app/CC.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/CC.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/app/CC.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,2 +1,10 @@
-# -*- Makefile -*- Time-stamp: <04/08/23 23:07:09 ptr>
-# $Id$
+# -*- Makefile -*- Time-stamp: <07/03/08 21:53:08 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
Modified: trunk/complement/explore/Makefiles/gmake/app/aCC.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/aCC.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/app/aCC.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,3 +1,10 @@
-# -*- Makefile -*- Time-stamp: <05/03/24 11:29:23 ptr>
-# $Id$
-
+# -*- Makefile -*- Time-stamp: <07/03/08 21:55:22 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
Deleted: trunk/complement/explore/Makefiles/gmake/app/clean.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/clean.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/app/clean.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,35 +0,0 @@
-# -*- makefile -*- Time-stamp: <06/11/17 00:29:39 ptr>
-#
-# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
-# Petr Ovtchenkov
-#
-# Portion Copyright (c) 1999-2001
-# Parallel Graphics Ltd.
-#
-# Licensed under the Academic Free License version 3.0
-#
-
-define prog_clean
-clean::
- @rm -f $${$(1)_PRG} $${$(1)_PRG_DBG} $${$(1)_PRG_STLDBG}
-
-uninstall::
- @rm -f $$(INSTALL_BIN_DIR)/$$($(1)_PRG) $$(INSTALL_BIN_DIR_DBG)/$$($(1)_PRG_DBG) $$(INSTALL_BIN_DIR_STLDBG)/$$($(1)_PRG_STLDBG)
-endef
-
-clean::
-ifdef PRGNAME
- @-rm -f ${PRG} ${PRG_DBG} ${PRG_STLDBG}
-endif
-
-$(foreach prg,$(PRGNAMES),$(eval $(call prog_clean,$(prg))))
-
-distclean::
- @-rm -f $(DEPENDS_COLLECTION)
- @-rmdir -p ${OUTPUT_DIR} ${OUTPUT_DIR_DBG} ${OUTPUT_DIR_STLDBG} 2>/dev/null
-
-uninstall::
-ifdef PRGNAME
- @-rm -f $(INSTALL_BIN_DIR)/$(PRG) $(INSTALL_BIN_DIR_DBG)/$(PRG_DBG) $(INSTALL_BIN_DIR_STLDBG)/$(PRG_STLDBG)
-endif
- @-rmdir -p $(INSTALL_BIN_DIR) $(INSTALL_BIN_DIR_DBG) $(INSTALL_BIN_DIR_STLDBG) 2>/dev/null
Modified: trunk/complement/explore/Makefiles/gmake/app/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/gcc.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/app/gcc.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,6 +1,6 @@
-# -*- Makefile -*- Time-stamp: <06/11/10 17:28:41 ptr>
+# -*- Makefile -*- Time-stamp: <07/03/08 21:23:42 ptr>
#
-# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
# Petr Ovtchenkov
#
# Portion Copyright (c) 1999-2001
@@ -106,12 +106,12 @@
# ifeq ($(CXX_VERSION_MAJOR),3)
ifeq ($(OSNAME),linux)
-START_OBJ := $(shell for o in crt{1,i,begin}.o; do ${CXX} -print-file-name=$$o; done)
-END_OBJ := $(shell for o in crt{end,n}.o; do ${CXX} -print-file-name=$$o; done)
+START_OBJ := $(shell for o in crt1.o crti.o crtbegin.o; do ${CXX} -print-file-name=$$o; done)
+END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} -print-file-name=$$o; done)
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm
endif
ifeq ($(OSNAME),openbsd)
-START_OBJ := $(shell for o in crt{0,begin}.o; do ${CXX} -print-file-name=$$o; done)
+START_OBJ := $(shell for o in crt0.o crtbegin.o; do ${CXX} -print-file-name=$$o; done)
END_OBJ := $(shell for o in crtend.o; do ${CXX} -print-file-name=$$o; done)
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm
endif
@@ -123,8 +123,8 @@
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -l${PTHR} -lc -lm
endif
ifeq ($(OSNAME),netbsd)
-START_OBJ := $(shell for o in crt{1,i,begin}.o; do ${CXX} -print-file-name=$$o; done)
-END_OBJ := $(shell for o in crt{end,n}.o; do ${CXX} -print-file-name=$$o; done)
+START_OBJ := $(shell for o in crt1.o crti.o crtbegin.o; do ${CXX} -print-file-name=$$o; done)
+END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} -print-file-name=$$o; done)
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm
endif
ifeq ($(OSNAME),sunos)
Modified: trunk/complement/explore/Makefiles/gmake/app/icc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/icc.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/app/icc.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,3 +1,10 @@
-# -*- Makefile -*- Time-stamp: <04/07/25 13:26:49 ptr>
-# $Id$
-
+# -*- Makefile -*- Time-stamp: <07/03/08 21:55:41 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
Deleted: trunk/complement/explore/Makefiles/gmake/app/macro.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/macro.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/app/macro.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,34 +0,0 @@
-# Time-stamp: <06/11/16 23:37:38 ptr>
-#
-# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
-# Petr Ovtchenkov
-#
-# Portion Copyright (c) 1999-2001
-# Parallel Graphics Ltd.
-#
-# Licensed under the Academic Free License version 3.0
-#
-
-ifdef PRGNAME
-PRG := $(OUTPUT_DIR)/${PRGNAME}${EXE}
-PRG_DBG := $(OUTPUT_DIR_DBG)/${PRGNAME}${EXE}
-PRG_STLDBG := $(OUTPUT_DIR_STLDBG)/${PRGNAME}${EXE}
-endif
-
-ALLPRGS = ${PRG}
-ALLPRGS_DBG = ${PRG_DBG}
-ALLPRGS_STLDBG = ${PRG_STLDBG}
-
-define prog_prog
-$(1)_PRG := $(OUTPUT_DIR)/$(1)${EXE}
-$(1)_PRG_DBG := $(OUTPUT_DIR_DBG)/$(1)${EXE}
-$(1)_PRG_STLDBG := $(OUTPUT_DIR_STLDBG)/$(1)${EXE}
-
-ALLPRGS += $${$(1)_PRG}
-ALLPRGS_DBG += $${$(1)_PRG_DBG}
-ALLPRGS_STLDBG += $${$(1)_PRG_STLDBG}
-endef
-
-$(foreach prg,$(PRGNAMES),$(eval $(call prog_prog,$(prg))))
-
-LDFLAGS += ${LDSEARCH}
Modified: trunk/complement/explore/Makefiles/gmake/app/top.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/top.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/app/top.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <06/11/10 17:28:09 ptr>
+# -*- makefile -*- Time-stamp: <07/03/08 21:59:26 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -9,8 +9,55 @@
# Licensed under the Academic Free License version 3.0
#
-include ${RULESBASE}/${USE_MAKE}/app/macro.mak
+ifdef PRGNAME
+PRG := $(OUTPUT_DIR)/${PRGNAME}${EXE}
+PRG_DBG := $(OUTPUT_DIR_DBG)/${PRGNAME}${EXE}
+PRG_STLDBG := $(OUTPUT_DIR_STLDBG)/${PRGNAME}${EXE}
+endif
+
+ALLPRGS = ${PRG}
+ALLPRGS_DBG = ${PRG_DBG}
+ALLPRGS_STLDBG = ${PRG_STLDBG}
+
+define prog_prog
+$(1)_PRG := $(OUTPUT_DIR)/$(1)${EXE}
+$(1)_PRG_DBG := $(OUTPUT_DIR_DBG)/$(1)${EXE}
+$(1)_PRG_STLDBG := $(OUTPUT_DIR_STLDBG)/$(1)${EXE}
+
+ALLPRGS += $${$(1)_PRG}
+ALLPRGS_DBG += $${$(1)_PRG_DBG}
+ALLPRGS_STLDBG += $${$(1)_PRG_STLDBG}
+endef
+
+$(foreach prg,$(PRGNAMES),$(eval $(call prog_prog,$(prg))))
+
+LDFLAGS += ${LDSEARCH}
+
include ${RULESBASE}/${USE_MAKE}/app/${COMPILER_NAME}.mak
include ${RULESBASE}/${USE_MAKE}/app/rules.mak
include ${RULESBASE}/${USE_MAKE}/app/rules-install.mak
-include ${RULESBASE}/${USE_MAKE}/app/clean.mak
+
+define prog_clean
+clean::
+ @rm -f $${$(1)_PRG} $${$(1)_PRG_DBG} $${$(1)_PRG_STLDBG}
+
+uninstall::
+ @rm -f $$(INSTALL_BIN_DIR)/$$($(1)_PRG) $$(INSTALL_BIN_DIR_DBG)/$$($(1)_PRG_DBG) $$(INSTALL_BIN_DIR_STLDBG)/$$($(1)_PRG_STLDBG)
+endef
+
+clean::
+ifdef PRGNAME
+ @-rm -f ${PRG} ${PRG_DBG} ${PRG_STLDBG}
+endif
+
+$(foreach prg,$(PRGNAMES),$(eval $(call prog_clean,$(prg))))
+
+distclean::
+ @-rm -f $(DEPENDS_COLLECTION)
+ @-rmdir -p ${OUTPUT_DIR} ${OUTPUT_DIR_DBG} ${OUTPUT_DIR_STLDBG} 2>/dev/null
+
+uninstall::
+ifdef PRGNAME
+ @-rm -f $(INSTALL_BIN_DIR)/$(PRG) $(INSTALL_BIN_DIR_DBG)/$(PRG_DBG) $(INSTALL_BIN_DIR_STLDBG)/$(PRG_STLDBG)
+endif
+ @-rmdir -p $(INSTALL_BIN_DIR) $(INSTALL_BIN_DIR_DBG) $(INSTALL_BIN_DIR_STLDBG) 2>/dev/null
Deleted: trunk/complement/explore/Makefiles/gmake/cygming/extern.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/cygming/extern.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/cygming/extern.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,63 +0,0 @@
-# Time-stamp: <03/07/31 14:20:16 ptr>
-# $Id$
-
-# This is Complement project (really not extern):
-
-CoMT_LIB_DIR ?= ${INSTALL_LIB_DIR}
-CoMT_LIB_DIR_DBG ?= ${INSTALL_LIB_DIR_DBG}
-CoMT_LIB_DIR_STLDBG ?= ${INSTALL_LIB_DIR_STLDBG}
-CoMT_BIN_DIR ?= ${INSTALL_BIN_DIR}
-CoMT_BIN_DIR_DBG ?= ${INSTALL_BIN_DIR}
-CoMT_BIN_DIR_STLDBG ?= ${INSTALL_BIN_DIR}
-
-CoMT_INCLUDE_DIR ?= ${CoMT_DIR}/include
-
-# This file reflect versions of third-party libraries that
-# used in projects
-
-# STLport library
-#STLPORT_LIB_DIR ?= /usr/local/lib
-#STLPORT_INCLUDE_DIR ?= /usr/local/include/stlport
-#STLPORT_VER ?= 4.5
-STLPORT_LIB_DIR ?= $(STLPORT_DIR)/lib
-STLPORT_INCLUDE_DIR ?= $(STLPORT_DIR)/stlport
-STLPORT_VER ?= 4.5.5
-
-# PostgreSQL library version:
-
-PG_INCLUDE ?= $(PG_DIR)/include
-PG_LIB ?= $(PG_DIR)/lib
-PG_LIB_VER_MAJOR = 2
-PG_LIB_VER_MINOR = 1
-
-# Readline libraries version:
-
-RL_INCLUDE ?= /usr/local/include/readline
-RL_LIB ?= /usr/local/lib
-RL_LIB_VER_MAJOR = 4
-RL_LIB_VER_MINOR = 2
-
-# gSOAP (http://gsoap2.sourceforge.net)
-
-gSOAP_INCLUDE_DIR ?= ${gSOAP_DIR}/include
-gSOAP_LIB_DIR ?= ${gSOAP_DIR}/lib
-gSOAP_BIN_DIR ?= ${gSOAP_DIR}/bin
-
-# boost (http://www.boost.org, http://boost.sourceforge.net)
-BOOST_INCLUDE_DIR ?= ${BOOST_DIR}
-
-# This file reflect versions of third-party libraries that
-# used in projects, with make-depend style
-
-ifeq ($(OSNAME),sunos)
-PG_DIR ?= /opt/PGpgsql
-endif
-ifeq ($(OSNAME),linux)
-PG_DIR ?= /usr/local/pgsql
-endif
-
-gSOAP_DIR ?= /opt/gSOAP-2.2.3
-BOOST_DIR ?= ${SRCROOT}/../extern/boost
-STLPORT_DIR ?= e:/STLlab/STLport
-CoMT_DIR ?= ${SRCROOT}
-
Deleted: trunk/complement/explore/Makefiles/gmake/darwin/extern.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/darwin/extern.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/darwin/extern.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,63 +0,0 @@
-# Time-stamp: <03/07/15 17:46:28 ptr>
-# $Id$
-
-
-# This is Complement project (really not extern):
-
-CoMT_LIB_DIR ?= ${INSTALL_LIB_DIR}
-CoMT_LIB_DIR_DBG ?= ${INSTALL_LIB_DIR_DBG}
-CoMT_LIB_DIR_STLDBG ?= ${INSTALL_LIB_DIR_STLDBG}
-CoMT_BIN_DIR ?= ${INSTALL_BIN_DIR}
-CoMT_BIN_DIR_DBG ?= ${INSTALL_BIN_DIR_DBG}
-CoMT_BIN_DIR_STLDBG ?= ${INSTALL_BIN_DIR_STLDBG}
-
-CoMT_INCLUDE_DIR ?= ${CoMT_DIR}/include
-
-# This file reflect versions of third-party libraries that
-# used in projects
-
-# STLport library
-#STLPORT_LIB_DIR ?= /usr/local/lib
-#STLPORT_INCLUDE_DIR ?= /usr/local/include/stlport
-#STLPORT_VER ?= 4.5
-STLPORT_LIB_DIR ?= $(STLPORT_DIR)/${TARGET_NAME}lib
-STLPORT_INCLUDE_DIR ?= $(STLPORT_DIR)/stlport
-STLPORT_VER ?= 4.5.5
-
-# PostgreSQL library version:
-
-PG_INCLUDE ?= $(PG_DIR)/include
-PG_LIB ?= $(PG_DIR)/lib
-PG_LIB_VER_MAJOR = 2
-PG_LIB_VER_MINOR = 1
-
-# Readline libraries version:
-
-RL_INCLUDE ?= /usr/local/include/readline
-RL_LIB ?= /usr/local/lib
-RL_LIB_VER_MAJOR = 4
-RL_LIB_VER_MINOR = 2
-
-# gSOAP (http://gsoap2.sourceforge.net)
-
-gSOAP_INCLUDE_DIR ?= ${gSOAP_DIR}/include
-gSOAP_LIB_DIR ?= ${gSOAP_DIR}/lib
-gSOAP_BIN_DIR ?= ${gSOAP_DIR}/bin
-
-# boost (http://www.boost.org, http://boost.sourceforge.net)
-BOOST_INCLUDE_DIR ?= ${BOOST_DIR}
-
-# This file reflect versions of third-party libraries that
-# used in projects, with make-depend style
-
-ifeq ($(OSNAME),sunos)
-PG_DIR ?= /opt/PGpgsql
-endif
-ifeq ($(OSNAME),linux)
-PG_DIR ?= /usr/local/pgsql
-endif
-
-gSOAP_DIR ?= /opt/gSOAP-2.2.3
-BOOST_DIR ?= ${SRCROOT}/../extern/boost
-STLPORT_DIR ?= /mnt/STLport-R451_dev
-CoMT_DIR ?= ${SRCROOT}
Modified: trunk/complement/explore/Makefiles/gmake/darwin/sys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/darwin/sys.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/darwin/sys.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,5 +1,13 @@
-# Time-stamp: <05/09/09 21:13:00 ptr>
-# $Id$
+# Time-stamp: <07/03/08 21:46:12 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
INSTALL := /usr/bin/install
Modified: trunk/complement/explore/Makefiles/gmake/darwin/targetsys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/darwin/targetsys.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/darwin/targetsys.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,5 +1,13 @@
-# Time-stamp: <05/09/09 21:04:30 ptr>
-# $Id$
+# Time-stamp: <07/03/08 21:46:37 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
SO := dylib
Deleted: trunk/complement/explore/Makefiles/gmake/freebsd/extern.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/freebsd/extern.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/freebsd/extern.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,63 +0,0 @@
-# Time-stamp: <03/07/15 17:46:28 ptr>
-# $Id$
-
-
-# This is Complement project (really not extern):
-
-CoMT_LIB_DIR ?= ${INSTALL_LIB_DIR}
-CoMT_LIB_DIR_DBG ?= ${INSTALL_LIB_DIR_DBG}
-CoMT_LIB_DIR_STLDBG ?= ${INSTALL_LIB_DIR_STLDBG}
-CoMT_BIN_DIR ?= ${INSTALL_BIN_DIR}
-CoMT_BIN_DIR_DBG ?= ${INSTALL_BIN_DIR_DBG}
-CoMT_BIN_DIR_STLDBG ?= ${INSTALL_BIN_DIR_STLDBG}
-
-CoMT_INCLUDE_DIR ?= ${CoMT_DIR}/include
-
-# This file reflect versions of third-party libraries that
-# used in projects
-
-# STLport library
-#STLPORT_LIB_DIR ?= /usr/local/lib
-#STLPORT_INCLUDE_DIR ?= /usr/local/include/stlport
-#STLPORT_VER ?= 4.5
-STLPORT_LIB_DIR ?= $(STLPORT_DIR)/${TARGET_NAME}lib
-STLPORT_INCLUDE_DIR ?= $(STLPORT_DIR)/stlport
-STLPORT_VER ?= 4.5.5
-
-# PostgreSQL library version:
-
-PG_INCLUDE ?= $(PG_DIR)/include
-PG_LIB ?= $(PG_DIR)/lib
-PG_LIB_VER_MAJOR = 2
-PG_LIB_VER_MINOR = 1
-
-# Readline libraries version:
-
-RL_INCLUDE ?= /usr/local/include/readline
-RL_LIB ?= /usr/local/lib
-RL_LIB_VER_MAJOR = 4
-RL_LIB_VER_MINOR = 2
-
-# gSOAP (http://gsoap2.sourceforge.net)
-
-gSOAP_INCLUDE_DIR ?= ${gSOAP_DIR}/include
-gSOAP_LIB_DIR ?= ${gSOAP_DIR}/lib
-gSOAP_BIN_DIR ?= ${gSOAP_DIR}/bin
-
-# boost (http://www.boost.org, http://boost.sourceforge.net)
-BOOST_INCLUDE_DIR ?= ${BOOST_DIR}
-
-# This file reflect versions of third-party libraries that
-# used in projects, with make-depend style
-
-ifeq ($(OSNAME),sunos)
-PG_DIR ?= /opt/PGpgsql
-endif
-ifeq ($(OSNAME),linux)
-PG_DIR ?= /usr/local/pgsql
-endif
-
-gSOAP_DIR ?= /opt/gSOAP-2.2.3
-BOOST_DIR ?= ${SRCROOT}/../extern/boost
-STLPORT_DIR ?= /mnt/STLport-R451_dev
-CoMT_DIR ?= ${SRCROOT}
Modified: trunk/complement/explore/Makefiles/gmake/freebsd/sys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/freebsd/sys.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/freebsd/sys.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,5 +1,13 @@
-# Time-stamp: <05/09/09 21:10:10 ptr>
-# $Id$
+# Time-stamp: <07/03/08 21:50:00 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
INSTALL := /usr/bin/install
Modified: trunk/complement/explore/Makefiles/gmake/freebsd/targetsys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/freebsd/targetsys.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/freebsd/targetsys.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,5 +1,13 @@
-# Time-stamp: <05/09/09 21:09:21 ptr>
-# $Id$
+# Time-stamp: <07/03/08 21:50:23 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
SO := so
Deleted: trunk/complement/explore/Makefiles/gmake/hp-ux/extern.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/hp-ux/extern.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/hp-ux/extern.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,16 +0,0 @@
-# Time-stamp: <03/07/15 17:46:28 ptr>
-# $Id$
-
-
-# This file reflect versions of third-party libraries that
-# used in projects
-
-# STLport library
-STLPORT_LIB_DIR ?= $(STLPORT_DIR)/${TARGET_NAME}lib
-STLPORT_INCLUDE_DIR ?= $(STLPORT_DIR)/stlport
-STLPORT_VER ?= 4.5.5
-
-# boost (http://www.boost.org, http://boost.sourceforge.net)
-BOOST_INCLUDE_DIR ?= ${BOOST_DIR}
-
-BOOST_DIR ?= ${SRCROOT}/../extern/boost
Modified: trunk/complement/explore/Makefiles/gmake/icc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/icc.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/icc.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,5 +1,13 @@
-# Time-stamp: <03/11/30 11:46:14 ptr>
-# $Id$
+# Time-stamp: <07/03/08 21:41:21 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
#INCLUDES :=
Modified: trunk/complement/explore/Makefiles/gmake/lib/CC.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/CC.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/lib/CC.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,5 +1,13 @@
-# -*- makefile -*- Time-stamp: <04/08/23 23:07:35 ptr>
-# $Id$
+# -*- makefile -*- Time-stamp: <07/03/08 21:39:22 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
OPT += -xcode=pic32
Modified: trunk/complement/explore/Makefiles/gmake/lib/aCC.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/aCC.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/lib/aCC.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,5 +1,13 @@
-# -*- makefile -*- Time-stamp: <05/03/24 11:33:35 ptr>
-# $Id$
+# -*- makefile -*- Time-stamp: <07/03/08 21:38:16 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
dbg-shared: LDFLAGS += -shared -Wl,-C20 -Wl,-dynamic -Wl,+h$(SO_NAME_DBGxx) ${LDSEARCH}
stldbg-shared: LDFLAGS += -shared -Wl,-C20 -Wl,-dynamic -Wl,+h$(SO_NAME_STLDBGxx) ${LDSEARCH}
Modified: trunk/complement/explore/Makefiles/gmake/lib/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/gcc.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/lib/gcc.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,4 +1,13 @@
-# -*- makefile -*- Time-stamp: <06/01/18 15:05:04 ptr>
+# -*- makefile -*- Time-stamp: <07/03/08 21:26:20 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
# Oh, the commented below work for gmake 3.78.1 and above,
# but phrase without tag not work for it. Since gmake 3.79
@@ -103,9 +112,9 @@
# Include whole language support archive (libsupc++.a) into libstlport:
# all C++ issues are in libstlport now.
ifeq ($(OSNAME),linux)
-START_OBJ := $(shell for o in crt{i,beginS}.o; do ${CXX} -print-file-name=$$o; done)
-#START_A_OBJ := $(shell for o in crt{i,beginT}.o; do ${CXX} -print-file-name=$$o; done)
-END_OBJ := $(shell for o in crt{endS,n}.o; do ${CXX} -print-file-name=$$o; done)
+START_OBJ := $(shell for o in crti.o crtbeginS.o; do ${CXX} -print-file-name=$$o; done)
+#START_A_OBJ := $(shell for o in crti.o crtbeginT.o; do ${CXX} -print-file-name=$$o; done)
+END_OBJ := $(shell for o in crtendS.o crtn.o; do ${CXX} -print-file-name=$$o; done)
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm
endif
ifeq ($(OSNAME),openbsd)
@@ -121,8 +130,8 @@
STDLIBS := ${STLPORT_LIB} ${_LGCC_S} -l${PTHR} -lc -lm
endif
ifeq ($(OSNAME),netbsd)
-START_OBJ := $(shell for o in crt{i,beginS}.o; do ${CXX} -print-file-name=$$o; done)
-END_OBJ := $(shell for o in crt{endS,n}.o; do ${CXX} -print-file-name=$$o; done)
+START_OBJ := $(shell for o in crti.o crtbeginS.o; do ${CXX} -print-file-name=$$o; done)
+END_OBJ := $(shell for o in crtendS.o crtn.o; do ${CXX} -print-file-name=$$o; done)
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm
endif
ifeq ($(OSNAME),sunos)
Modified: trunk/complement/explore/Makefiles/gmake/lib/icc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/icc.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/lib/icc.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,7 +1,14 @@
-# -*- makefile -*- Time-stamp: <03/11/30 11:41:22 ptr>
-# $Id$
+# -*- makefile -*- Time-stamp: <07/03/08 21:37:08 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
-
# Oh, the commented below work for gmake 3.78.1 and above,
# but phrase without tag not work for it. Since gmake 3.79
# tag with assignment fail, but work assignment for all tags
Deleted: trunk/complement/explore/Makefiles/gmake/lib/mwccnlm.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/mwccnlm.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/lib/mwccnlm.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,3 +0,0 @@
-# -*- makefile -*- Time-stamp: <05/05/06 17:29:15 ptr>
-# $Id$
-
Modified: trunk/complement/explore/Makefiles/gmake/lib/rules-a.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/rules-a.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/lib/rules-a.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,4 +1,13 @@
-# -*- makefile -*- Time-stamp: <04/07/25 16:54:59 ptr>
+# -*- makefile -*- Time-stamp: <07/03/08 21:34:05 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
# Static libraries tags
Modified: trunk/complement/explore/Makefiles/gmake/lib/vc6.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/vc6.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/lib/vc6.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,7 +1,14 @@
-# -*- makefile -*- Time-stamp: <03/10/27 18:30:31 ptr>
-# $Id$
+# -*- makefile -*- Time-stamp: <07/03/08 21:35:57 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
-
# Oh, the commented below work for gmake 3.78.1 and above,
# but phrase without tag not work for it. Since gmake 3.79
# tag with assignment fail, but work assignment for all tags
Deleted: trunk/complement/explore/Makefiles/gmake/linux/extern.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/extern.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/linux/extern.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,26 +0,0 @@
-# Time-stamp: <05/09/02 00:48:09 ptr>
-
-# This is Complement project (really not extern):
-
-CoMT_LIB_DIR ?= ${INSTALL_LIB_DIR}
-CoMT_LIB_DIR_DBG ?= ${INSTALL_LIB_DIR_DBG}
-CoMT_LIB_DIR_STLDBG ?= ${INSTALL_LIB_DIR_STLDBG}
-CoMT_BIN_DIR ?= ${INSTALL_BIN_DIR}
-CoMT_BIN_DIR_DBG ?= ${INSTALL_BIN_DIR_DBG}
-CoMT_BIN_DIR_STLDBG ?= ${INSTALL_BIN_DIR_STLDBG}
-
-CoMT_INCLUDE_DIR ?= ${CoMT_DIR}/include
-
-# This file reflect versions of third-party libraries that
-# used in projects
-
-# STLport library
-STLPORT_LIB_DIR ?= $(STLPORT_DIR)/${TARGET_NAME}lib
-STLPORT_INCLUDE_DIR ?= $(STLPORT_DIR)/stlport
-
-# boost (http://www.boost.org, http://boost.sourceforge.net)
-BOOST_INCLUDE_DIR ?= ${BOOST_DIR}
-
-BOOST_DIR ?= ${SRCROOT}/../extern/boost
-STLPORT_DIR ?= /export/home/ptr/STLport.lab/STLport
-CoMT_DIR ?= ${SRCROOT}
Modified: trunk/complement/explore/Makefiles/gmake/linux/targetsys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/targetsys.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/linux/targetsys.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,5 +1,13 @@
-# Time-stamp: <05/09/09 20:59:42 ptr>
-# $Id$
+# Time-stamp: <07/03/08 21:52:04 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
SO := so
Deleted: trunk/complement/explore/Makefiles/gmake/openbsd/extern.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/openbsd/extern.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/openbsd/extern.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,63 +0,0 @@
-# Time-stamp: <04/03/16 17:06:58 ptr>
-# $Id$
-
-
-# This is Complement project (really not extern):
-
-CoMT_LIB_DIR ?= ${INSTALL_LIB_DIR}
-CoMT_LIB_DIR_DBG ?= ${INSTALL_LIB_DIR_DBG}
-CoMT_LIB_DIR_STLDBG ?= ${INSTALL_LIB_DIR_STLDBG}
-CoMT_BIN_DIR ?= ${INSTALL_BIN_DIR}
-CoMT_BIN_DIR_DBG ?= ${INSTALL_BIN_DIR_DBG}
-CoMT_BIN_DIR_STLDBG ?= ${INSTALL_BIN_DIR_STLDBG}
-
-CoMT_INCLUDE_DIR ?= ${CoMT_DIR}/include
-
-# This file reflect versions of third-party libraries that
-# used in projects
-
-# STLport library
-#STLPORT_LIB_DIR ?= /usr/local/lib
-#STLPORT_INCLUDE_DIR ?= /usr/local/include/stlport
-#STLPORT_VER ?= 4.5
-STLPORT_LIB_DIR ?= $(STLPORT_DIR)/$(TARGET_NAME)lib
-STLPORT_INCLUDE_DIR ?= $(STLPORT_DIR)/stlport
-STLPORT_VER ?= 4.5.5
-
-# PostgreSQL library version:
-
-PG_INCLUDE ?= $(PG_DIR)/include
-PG_LIB ?= $(PG_DIR)/lib
-PG_LIB_VER_MAJOR = 2
-PG_LIB_VER_MINOR = 1
-
-# Readline libraries version:
-
-RL_INCLUDE ?= /usr/local/include/readline
-RL_LIB ?= /usr/local/lib
-RL_LIB_VER_MAJOR = 4
-RL_LIB_VER_MINOR = 2
-
-# gSOAP (http://gsoap2.sourceforge.net)
-
-gSOAP_INCLUDE_DIR ?= ${gSOAP_DIR}/include
-gSOAP_LIB_DIR ?= ${gSOAP_DIR}/lib
-gSOAP_BIN_DIR ?= ${gSOAP_DIR}/bin
-
-# boost (http://www.boost.org, http://boost.sourceforge.net)
-BOOST_INCLUDE_DIR ?= ${BOOST_DIR}
-
-# This file reflect versions of third-party libraries that
-# used in projects, with make-depend style
-
-ifeq ($(OSNAME),sunos)
-PG_DIR ?= /opt/PGpgsql
-endif
-ifeq ($(OSNAME),linux)
-PG_DIR ?= /usr/local/pgsql
-endif
-
-gSOAP_DIR ?= /opt/gSOAP-2.2.3
-BOOST_DIR ?= ${SRCROOT}/../extern/boost
-STLPORT_DIR ?= /mnt/STLport-R451_dev
-CoMT_DIR ?= ${SRCROOT}
Deleted: trunk/complement/explore/Makefiles/gmake/sunos/extern.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/sunos/extern.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/sunos/extern.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,63 +0,0 @@
-# Time-stamp: <03/07/15 17:46:28 ptr>
-# $Id$
-
-
-# This is Complement project (really not extern):
-
-CoMT_LIB_DIR ?= ${INSTALL_LIB_DIR}
-CoMT_LIB_DIR_DBG ?= ${INSTALL_LIB_DIR_DBG}
-CoMT_LIB_DIR_STLDBG ?= ${INSTALL_LIB_DIR_STLDBG}
-CoMT_BIN_DIR ?= ${INSTALL_BIN_DIR}
-CoMT_BIN_DIR_DBG ?= ${INSTALL_BIN_DIR_DBG}
-CoMT_BIN_DIR_STLDBG ?= ${INSTALL_BIN_DIR_STLDBG}
-
-CoMT_INCLUDE_DIR ?= ${CoMT_DIR}/include
-
-# This file reflect versions of third-party libraries that
-# used in projects
-
-# STLport library
-#STLPORT_LIB_DIR ?= /usr/local/lib
-#STLPORT_INCLUDE_DIR ?= /usr/local/include/stlport
-#STLPORT_VER ?= 4.5
-STLPORT_LIB_DIR ?= $(STLPORT_DIR)/${TARGET_NAME}lib
-STLPORT_INCLUDE_DIR ?= $(STLPORT_DIR)/stlport
-STLPORT_VER ?= 4.5.5
-
-# PostgreSQL library version:
-
-PG_INCLUDE ?= $(PG_DIR)/include
-PG_LIB ?= $(PG_DIR)/lib
-PG_LIB_VER_MAJOR = 2
-PG_LIB_VER_MINOR = 1
-
-# Readline libraries version:
-
-RL_INCLUDE ?= /usr/local/include/readline
-RL_LIB ?= /usr/local/lib
-RL_LIB_VER_MAJOR = 4
-RL_LIB_VER_MINOR = 2
-
-# gSOAP (http://gsoap2.sourceforge.net)
-
-gSOAP_INCLUDE_DIR ?= ${gSOAP_DIR}/include
-gSOAP_LIB_DIR ?= ${gSOAP_DIR}/lib
-gSOAP_BIN_DIR ?= ${gSOAP_DIR}/bin
-
-# boost (http://www.boost.org, http://boost.sourceforge.net)
-BOOST_INCLUDE_DIR ?= ${BOOST_DIR}
-
-# This file reflect versions of third-party libraries that
-# used in projects, with make-depend style
-
-ifeq ($(OSNAME),sunos)
-PG_DIR ?= /opt/PGpgsql
-endif
-ifeq ($(OSNAME),linux)
-PG_DIR ?= /usr/local/pgsql
-endif
-
-gSOAP_DIR ?= /opt/gSOAP-2.2.3
-BOOST_DIR ?= ${SRCROOT}/../extern/boost
-STLPORT_DIR ?= /export/home/ptr/STLport.lab/STLport
-CoMT_DIR ?= ${SRCROOT}
Modified: trunk/complement/explore/Makefiles/gmake/sunos/sys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/sunos/sys.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/sunos/sys.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,5 +1,13 @@
-# Time-stamp: <05/09/09 21:10:32 ptr>
-# $Id$
+# Time-stamp: <07/03/08 21:48:24 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
INSTALL := /usr/ucb/install
Modified: trunk/complement/explore/Makefiles/gmake/sunos/targetsys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/sunos/targetsys.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/sunos/targetsys.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,5 +1,13 @@
-# Time-stamp: <05/09/09 21:08:34 ptr>
-# $Id$
+# Time-stamp: <07/03/08 21:48:37 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
SO := so
Modified: trunk/complement/explore/Makefiles/gmake/sysid.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/sysid.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/sysid.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,4 +1,13 @@
-# Time-stamp: <05/12/14 20:48:55 ptr>
+# Time-stamp: <07/03/08 21:43:48 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
ifndef BUILD_DATE
Modified: trunk/complement/explore/Makefiles/gmake/vc6.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/vc6.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/vc6.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,5 +1,13 @@
-# Time-stamp: <03/10/29 21:09:09 ptr>
-# $Id$
+# Time-stamp: <07/03/08 21:41:52 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
#INCLUDES = -I$(SRCROOT)/include
#INCLUDES :=
Deleted: trunk/complement/explore/Makefiles/gmake/windows/extern.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/windows/extern.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/windows/extern.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,63 +0,0 @@
-# Time-stamp: <03/07/31 14:20:16 ptr>
-# $Id$
-
-# This is Complement project (really not extern):
-
-CoMT_LIB_DIR ?= ${INSTALL_LIB_DIR}
-CoMT_LIB_DIR_DBG ?= ${INSTALL_LIB_DIR_DBG}
-CoMT_LIB_DIR_STLDBG ?= ${INSTALL_LIB_DIR_STLDBG}
-CoMT_BIN_DIR ?= ${INSTALL_BIN_DIR}
-CoMT_BIN_DIR_DBG ?= ${INSTALL_BIN_DIR}
-CoMT_BIN_DIR_STLDBG ?= ${INSTALL_BIN_DIR}
-
-CoMT_INCLUDE_DIR ?= ${CoMT_DIR}/include
-
-# This file reflect versions of third-party libraries that
-# used in projects
-
-# STLport library
-#STLPORT_LIB_DIR ?= /usr/local/lib
-#STLPORT_INCLUDE_DIR ?= /usr/local/include/stlport
-#STLPORT_VER ?= 4.5
-STLPORT_LIB_DIR ?= $(STLPORT_DIR)/lib
-STLPORT_INCLUDE_DIR ?= $(STLPORT_DIR)/stlport
-STLPORT_VER ?= 4.5.5
-
-# PostgreSQL library version:
-
-PG_INCLUDE ?= $(PG_DIR)/include
-PG_LIB ?= $(PG_DIR)/lib
-PG_LIB_VER_MAJOR = 2
-PG_LIB_VER_MINOR = 1
-
-# Readline libraries version:
-
-RL_INCLUDE ?= /usr/local/include/readline
-RL_LIB ?= /usr/local/lib
-RL_LIB_VER_MAJOR = 4
-RL_LIB_VER_MINOR = 2
-
-# gSOAP (http://gsoap2.sourceforge.net)
-
-gSOAP_INCLUDE_DIR ?= ${gSOAP_DIR}/include
-gSOAP_LIB_DIR ?= ${gSOAP_DIR}/lib
-gSOAP_BIN_DIR ?= ${gSOAP_DIR}/bin
-
-# boost (http://www.boost.org, http://boost.sourceforge.net)
-BOOST_INCLUDE_DIR ?= ${BOOST_DIR}
-
-# This file reflect versions of third-party libraries that
-# used in projects, with make-depend style
-
-ifeq ($(OSNAME),sunos)
-PG_DIR ?= /opt/PGpgsql
-endif
-ifeq ($(OSNAME),linux)
-PG_DIR ?= /usr/local/pgsql
-endif
-
-gSOAP_DIR ?= /opt/gSOAP-2.2.3
-BOOST_DIR ?= ${SRCROOT}/../extern/boost
-STLPORT_DIR ?= e:/STLlab/STLport
-CoMT_DIR ?= ${SRCROOT}
-
Deleted: trunk/complement/explore/Makefiles/make.mak
===================================================================
--- trunk/complement/explore/Makefiles/make.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/make.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,4 +0,0 @@
-# Time-stamp: <03/07/03 17:14:26 ptr>
-# $Id$
-
-USE_MAKE := gmake
Modified: trunk/complement/explore/Makefiles/top.mak
===================================================================
--- trunk/complement/explore/Makefiles/top.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/top.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,4 +1,4 @@
-# Time-stamp: <06/11/10 16:22:00 ptr>
+# Time-stamp: <07/03/08 22:57:35 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -21,6 +21,7 @@
-include ${RULESBASE}/config.mak
ifndef COMPILER_NAME
+# gcc is default compiler, others specify explicitly;
COMPILER_NAME := gcc
endif
@@ -73,7 +74,8 @@
endif
# define what make clone we use
-include ${RULESBASE}/make.mak
+USE_MAKE := gmake
+
ifndef OSNAME
# identify OS and build date
include ${RULESBASE}/$(USE_MAKE)/sysid.mak
@@ -86,10 +88,10 @@
include ${RULESBASE}/$(USE_MAKE)/$(COMPILER_NAME).mak
# rules to make dirs for targets
include ${RULESBASE}/$(USE_MAKE)/targetdirs.mak
-# extern libraries
-include ${RULESBASE}/$(USE_MAKE)/$(OSNAME)/extern.mak
+# Extern projects for everyday usage and settings for ones
+include ${RULESBASE}/extern.mak
-# os-specific local rules
+# os-specific local rules (or other project-specific definitions)
-include specific.mak
# derive common targets (*.o, *.d),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-05-31 04:34:04
|
Revision: 1575
http://svn.sourceforge.net/complement/?rev=1575&view=rev
Author: complement
Date: 2007-05-30 21:34:01 -0700 (Wed, 30 May 2007)
Log Message:
-----------
remove bogus OSNAME cygming, replace one by normal windows; BCC and DMC compilers from STLport; HP's aCC options as in STLport
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
trunk/complement/explore/Makefiles/gmake/aCC.mak
trunk/complement/explore/Makefiles/gmake/app/gcc.mak
trunk/complement/explore/Makefiles/gmake/gcc.mak
trunk/complement/explore/Makefiles/gmake/hp-ux/sys.mak
trunk/complement/explore/Makefiles/gmake/hp-ux/targetsys.mak
trunk/complement/explore/Makefiles/gmake/lib/aCC.mak
trunk/complement/explore/Makefiles/gmake/lib/clean.mak
trunk/complement/explore/Makefiles/gmake/lib/gcc.mak
trunk/complement/explore/Makefiles/gmake/sysid.mak
trunk/complement/explore/Makefiles/gmake/targets.mak
trunk/complement/explore/Makefiles/gmake/windows/rules-install-so.mak
trunk/complement/explore/Makefiles/gmake/windows/rules-so.mak
trunk/complement/explore/Makefiles/gmake/windows/sys.mak
trunk/complement/explore/Makefiles/gmake/windows/targetsys.mak
Added Paths:
-----------
trunk/complement/explore/Makefiles/gmake/app/bcc.mak
trunk/complement/explore/Makefiles/gmake/app/dmc.mak
trunk/complement/explore/Makefiles/gmake/bcc.mak
trunk/complement/explore/Makefiles/gmake/dmc.mak
trunk/complement/explore/Makefiles/gmake/lib/bcc.mak
trunk/complement/explore/Makefiles/gmake/lib/dmc.mak
Removed Paths:
-------------
trunk/complement/explore/Makefiles/gmake/cygming/
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/ChangeLog 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,3 +1,20 @@
+2007-05-31 Petr Ovtchenkov <pt...@is...>
+
+ * gmake/app/gcc.mak, gmake/targets.mak, gmake/windows/rules-so.mak:
+ remove bogus OSNAME cygming, replace one by normal windows;
+
+ * gmake/gcc.mak, gmake/lib/gcc.mak, gmake/sysid.mak: ditto;
+
+ * gmake/windows/rules-install-so.mak, gmake/windows/sys.mak: ditto;
+
+ * gmake/windows/targetsys.mak: ditto;
+
+ * gmake/cygming: removed; use windows instead;
+
+ * dmc.mak, bcc.mak: included from STLport;
+
+ * aCC.mak: use options from STLport, it's more fresh.
+
2007-03-08 Petr Ovtchenkov <pt...@is...>
* make.mak: removed, make except GNU make can't work due to top.mak;
Modified: trunk/complement/explore/Makefiles/gmake/aCC.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/aCC.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/aCC.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,4 +1,4 @@
-# Time-stamp: <06/11/10 15:54:03 ptr>
+# Time-stamp: <07/05/31 01:07:37 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -9,8 +9,6 @@
# Licensed under the Academic Free License version 3.0
#
-INCLUDES :=
-
ifndef _FORCE_CXX
CXX := aCC
else
@@ -23,13 +21,12 @@
CC := $_FORCE_CC
endif
-CXX_VERSION := $(shell ${CXX} --version | grep ${CXX} | awk '{ print $$3; }')
+CXX_VERSION := $(shell ${CXX} --version 2>&1 | grep ${CXX} | awk '{ print $$6; }')
ifeq ($(CXX_VERSION),)
CXX_VERSION := $(shell ${CXX} --version)
endif
-CXX_VERSION_MAJOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$1; }')
-CXX_VERSION_MINOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$2; }')
-CXX_VERSION_PATCH := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$3; }')
+CXX_VERSION_MAJOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$2; }')
+CXX_VERSION_MINOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$3; }')
DEFS ?=
OPT ?=
@@ -39,8 +36,8 @@
LINK_OUTPUT_OPTION = ${OUTPUT_OPTION}
CPPFLAGS = $(DEFS) $(INCLUDES)
-CFLAGS = -Aa -z $(OPT)
-CXXFLAGS = -Aa -z $(OPT)
+CFLAGS = -Aa +z $(OPT)
+CXXFLAGS = -Aa +z -mt $(OPT)
CDEPFLAGS = -E +Md
CCDEPFLAGS = -E +Md
@@ -65,7 +62,7 @@
#stldbg-static-dep : OPT += -g
#stldbg-shared-dep : OPT += -g
-OPT += +Onolimit +W495,749
+OPT += +W495,749,2186,2191,2340,2430,2550
# dependency output parser (dependencies collector)
Added: trunk/complement/explore/Makefiles/gmake/app/bcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/bcc.mak (rev 0)
+++ trunk/complement/explore/Makefiles/gmake/app/bcc.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -0,0 +1,38 @@
+# -*- Makefile -*- Time-stamp: <07/05/31 01:05:40 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Copyright (c) 2006, 2007
+# Francois Dumont
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
+
+OPT += -tWC -w-par
+
+LDFLAGS += -ap -Tpe -w -w-dup
+
+START_OBJ = c0x32.obj
+
+install-dbg-shared: install-dbg-shared-tds
+install-stldbg-shared: install-stldbg-shared-tds
+
+install-dbg-static: install-dbg-static-tds
+install-stldbg-static: install-stldbg-static-tds
+
+install-dbg-shared-tds:
+ $(INSTALL_EXE) $(subst /,\,$(OUTPUT_DIR_DBG)/${PRGNAME}.tds $(INSTALL_BIN_DIR_DBG)/)
+
+install-stldbg-shared-tds:
+ $(INSTALL_EXE) $(subst /,\,$(OUTPUT_DIR_STLDBG)/${PRGNAME}.tds $(INSTALL_BIN_DIR_STLDBG)/)
+
+install-dbg-static-tds:
+ $(INSTALL_EXE) $(subst /,\,$(OUTPUT_DIR_DBG)/${PRGNAME}.tds $(INSTALL_BIN_DIR_DBG)/)
+
+install-stldbg-static-tds:
+ $(INSTALL_EXE) $(subst /,\,$(OUTPUT_DIR_STLDBG)/${PRGNAME}.tds $(INSTALL_BIN_DIR_STLDBG)/)
+
Added: trunk/complement/explore/Makefiles/gmake/app/dmc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/dmc.mak (rev 0)
+++ trunk/complement/explore/Makefiles/gmake/app/dmc.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -0,0 +1,80 @@
+# -*- Makefile -*- Time-stamp: <07/05/31 01:05:57 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Copyright (c) 2006, 2007
+# Francois Dumont
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
+
+CXXFLAGS += -w6 -w7 -w18
+
+stldbg-shared : CXXFLAGS += -HP50
+stldbg-static : CXXFLAGS += -HP50
+
+OPT += -WA
+
+release-shared: LDFLAGS +=
+release-static: LDFLAGS +=
+dbg-shared : LDFLAGS += /CODEVIEW/NOCVPACK
+dbg-static : LDFLAGS += /CODEVIEW/NOCVPACK
+stldbg-shared : LDFLAGS += /CODEVIEW/NOCVPACK
+stldbg-static : LDFLAGS += /CODEVIEW/NOCVPACK
+
+# workaround for stl/config/_auto_link.h
+STL_LIBNAME = stlport
+DBG_SUFFIX := g
+STLDBG_SUFFIX := stlg
+
+ifdef STLP_BUILD_LIB_MOTIF
+LIB_SUFFIX := _$(STLP_BUILD_LIB_MOTIF).${LIBMAJOR}.${LIBMINOR}
+else
+LIB_SUFFIX := .${LIBMAJOR}.${LIBMINOR}
+endif
+
+# Shared libraries:
+ifdef STLP_BUILD_FORCE_STATIC_RUNTIME
+LIB_TYPE := _x
+else
+LIB_TYPE :=
+endif
+
+LIB_NAME := $(LIB_PREFIX)${STL_LIBNAME}${LIB_TYPE}${LIB_SUFFIX}.$(LIB)
+LIB_NAME_DBG := $(LIB_PREFIX)${STL_LIBNAME}${DBG_SUFFIX}${LIB_TYPE}${LIB_SUFFIX}.$(LIB)
+LIB_NAME_STLDBG := $(LIB_PREFIX)${STL_LIBNAME}${STLDBG_SUFFIX}${LIB_TYPE}${LIB_SUFFIX}.$(LIB)
+
+# Static libraries:
+ifdef STLP_BUILD_FORCE_DYNAMIC_RUNTIME
+A_LIB_TYPE := _statix
+else
+A_LIB_TYPE := _static
+endif
+
+A_NAME := $(LIB_PREFIX)${STL_LIBNAME}${A_LIB_TYPE}${LIB_SUFFIX}.$(ARCH)
+A_NAME_DBG := $(LIB_PREFIX)${STL_LIBNAME}${DBG_SUFFIX}${A_LIB_TYPE}${LIB_SUFFIX}.${ARCH}
+A_NAME_STLDBG := ${LIB_PREFIX}${STL_LIBNAME}${STLDBG_SUFFIX}${A_LIB_TYPE}${LIB_SUFFIX}.${ARCH}
+
+ifndef STLP_BUILD_FORCE_STATIC_RUNTIME
+release-shared : LDLIBS += $(CURDIR)\..\..\..\lib\$(LIB_NAME)
+dbg-shared : LDLIBS += $(CURDIR)\..\..\..\lib\$(LIB_NAME_DBG)
+stldbg-shared : LDLIBS += $(CURDIR)\..\..\..\lib\$(LIB_NAME_STLDBG)
+else
+release-shared : LDLIBS += $(CURDIR)\..\..\..\lib\$(A_NAME)
+dbg-shared : LDLIBS += $(CURDIR)\..\..\..\lib\$(A_NAME_DBG)
+stldbg-shared : LDLIBS += $(CURDIR)\..\..\..\lib\$(A_NAME_STLDBG)
+endif
+ifndef STLP_BUILD_FORCE_DYNAMIC_RUNTIME
+release-static : LDLIBS += $(CURDIR)\..\..\..\lib\$(A_NAME)
+dbg-static : LDLIBS += $(CURDIR)\..\..\..\lib\$(A_NAME_DBG)
+stldbg-static : LDLIBS += $(CURDIR)\..\..\..\lib\$(A_NAME_STLDBG)
+else
+release-static : LDLIBS += $(CURDIR)\..\..\..\lib\$(LIB_NAME)
+dbg-static : LDLIBS += $(CURDIR)\..\..\..\lib\$(LIB_NAME_DBG)
+stldbg-static : LDLIBS += $(CURDIR)\..\..\..\lib\$(LIB_NAME_STLDBG)
+endif
+
Modified: trunk/complement/explore/Makefiles/gmake/app/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/gcc.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/app/gcc.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,4 +1,4 @@
-# -*- Makefile -*- Time-stamp: <07/03/08 21:23:42 ptr>
+# -*- Makefile -*- Time-stamp: <07/05/30 23:54:39 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
# Petr Ovtchenkov
@@ -55,7 +55,11 @@
ifeq ($(OSNAME),sunos)
_USE_NOSTDLIB := 1
endif
+
+ifeq ($(OSNAME),darwin)
+_USE_NOSTDLIB := 1
endif
+endif
ifndef WITHOUT_STLPORT
LDSEARCH += -L${STLPORT_LIB_DIR}
@@ -67,14 +71,6 @@
stldbg-shared: STLPORT_LIB = -lstlportstlg
stldbg-static: STLPORT_LIB = -Wl,-Bstatic -lstlportstlg -Wl,-Bdynamic
-
-ifeq ($(OSNAME),cygming)
-LIB_VERSION = ${LIBMAJOR}.${LIBMINOR}
-release-shared : STLPORT_LIB = -lstlport.${LIB_VERSION}
-dbg-shared : STLPORT_LIB = -lstlportg.${LIB_VERSION}
-stldbg-shared : STLPORT_LIB = -lstlportstlg.${LIB_VERSION}
-endif
-
ifeq ($(OSNAME),windows)
LIB_VERSION = ${LIBMAJOR}.${LIBMINOR}
release-shared : STLPORT_LIB = -lstlport.${LIB_VERSION}
@@ -132,6 +128,12 @@
END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} -print-file-name=$$o; done)
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm
endif
+ifeq ($(OSNAME),darwin)
+START_OBJ := -lcrt1.o -lcrt2.o
+END_OBJ :=
+STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lc -lm -lsupc++
+#LDFLAGS += -dynamic
+endif
LDFLAGS += -nostdlib
# endif
else
Added: trunk/complement/explore/Makefiles/gmake/bcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/bcc.mak (rev 0)
+++ trunk/complement/explore/Makefiles/gmake/bcc.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -0,0 +1,175 @@
+# Time-stamp: <07/05/31 01:03:15 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Copyright (c) 2006, 2007
+# Francois Dumont
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
+
+ALL_TAGS = all-static all-shared
+ifdef LIBNAME
+INSTALL_TAGS = install-static install-shared
+else
+INSTALL_TAGS = install-shared
+endif
+
+CXX := bcc32
+CC := bcc32
+RC := brcc32
+
+DEFS ?=
+OPT ?=
+
+CFLAGS = -q -ff
+CXXFLAGS = -q -ff
+
+OPT += -w-ccc -w-rch -w-ngu -w-inl -w-eff
+
+# release-shared : OPT += -w-inl
+
+ifdef STLP_BUILD_FORCE_DYNAMIC_RUNTIME
+release-static : OPT += -tWR
+dbg-static : OPT += -tWR
+stldbg-static : OPT += -tWR
+endif
+
+ifndef STLP_BUILD_FORCE_STATIC_RUNTIME
+release-shared : OPT += -tWR
+dbg-shared : OPT += -tWR
+stldbg-shared : OPT += -tWR
+endif
+
+ifdef STLP_BUILD_NO_RTTI
+OPT += -RT-
+endif
+
+ifndef STLP_BUILD_NO_THREAD
+OPT += -tWM
+endif
+
+#Add Windows target.
+ifndef STLP_BUILD_WINDOWS_95
+WINVER=0x0410
+else
+WINVER=0x0400
+endif
+release-shared: DEFS += -DWINVER=$(WINVER)
+dbg-shared: DEFS += -DWINVER=$(WINVER)
+stldbg-shared: DEFS += -DWINVER=$(WINVER)
+release-static: DEFS += -DWINVER=$(WINVER)
+dbg-static: DEFS += -DWINVER=$(WINVER)
+stldbg-static: DEFS += -DWINVER=$(WINVER)
+
+OUTPUT_OPTION = -o$@
+LINK_OUTPUT_OPTION = $@
+CPPFLAGS = $(DEFS) $(OPT) $(INCLUDES)
+
+CDEPFLAGS = -E -M
+CCDEPFLAGS = -E -M
+RCFLAGS = -32 -r -i${STLPORT_INCLUDE_DIR} -dCOMP=bcc
+
+release-shared : RCFLAGS += -dBUILD_INFOS="-O2 -vi-"
+dbg-shared : RCFLAGS += -dBUILD=d -dBUILD_INFOS="-R -v -y -D_DEBUG"
+stldbg-shared : RCFLAGS += -dBUILD=stld -dBUILD_INFOS="-R -v -y -D_DEBUG -D_STLP_DEBUG"
+RC_OUTPUT_OPTION = -fo$@
+
+COMPILE.rc = ${RC} ${RCFLAGS}
+LINK.cc = ilink32 $(subst /,\,$(LDFLAGS))
+
+LDFLAGS += -ap -D -Gn -Gi
+
+dbg-static : DEFS += -D_DEBUG
+dbg-shared : DEFS += -D_DEBUG
+stldbg-static : DEFS += -D_DEBUG
+stldbg-shared : DEFS += -D_DEBUG
+
+# STLport DEBUG mode specific defines
+stldbg-static : DEFS += -D_STLP_DEBUG
+stldbg-shared : DEFS += -D_STLP_DEBUG
+stldbg-static-dep : DEFS += -D_STLP_DEBUG
+stldbg-shared-dep : DEFS += -D_STLP_DEBUG
+
+# optimization and debug compiler flags
+release-static : OPT += -O2 -vi-
+release-shared : OPT += -O2 -vi-
+
+dbg-static : OPT += -R -v -y
+dbg-shared : OPT += -R -v -y
+stldbg-static : OPT += -R -v -y
+stldbg-shared : OPT += -R -v -y
+
+LDLIBS += import32.lib kernel32.lib
+ifndef STLP_BUILD_NO_THREAD
+ifndef STLP_BUILD_FORCE_STATIC_RUNTIME
+release-shared : LDLIBS += cw32mti.lib
+dbg-shared : LDLIBS += cw32mti.lib
+stldbg-shared : LDLIBS += cw32mti.lib
+else
+release-shared : LDLIBS += cw32mt.lib
+dbg-shared : LDLIBS += cw32mt.lib
+stldbg-shared : LDLIBS += cw32mt.lib
+endif
+ifndef STLP_BUILD_FORCE_DYNAMIC_RUNTIME
+release-static : LDLIBS += cw32mt.lib
+dbg-static : LDLIBS += cw32mt.lib
+stldbg-static : LDLIBS += cw32mt.lib
+else
+release-static : LDLIBS += cw32mti.lib
+dbg-static : LDLIBS += cw32mti.lib
+stldbg-static : LDLIBS += cw32mti.lib
+endif
+else
+ifndef STLP_BUILD_FORCE_STATIC_RUNTIME
+release-shared : LDLIBS += cw32i.lib
+dbg-shared : LDLIBS += cw32i.lib
+stldbg-shared : LDLIBS += cw32i.lib
+else
+release-shared : LDLIBS += cw32.lib
+dbg-shared : LDLIBS += cw32.lib
+stldbg-shared : LDLIBS += cw32.lib
+endif
+ifndef STLP_BUILD_FORCE_DYNAMIC_RUNTIME
+release-static : LDLIBS += cw32.lib
+dbg-static : LDLIBS += cw32.lib
+stldbg-static : LDLIBS += cw32.lib
+else
+release-static : LDLIBS += cw32i.lib
+dbg-static : LDLIBS += cw32i.lib
+stldbg-static : LDLIBS += cw32i.lib
+endif
+endif
+
+ifndef LIBNAME
+ifdef STLP_BUILD_FORCE_DYNAMIC_RUNTIME
+release-static: DEFS += -D_STLP_USE_STATIC_LIB
+dbg-static: DEFS += -D_STLP_USE_STATIC_LIB
+stldbg-static: DEFS += -D_STLP_USE_STATIC_LIB
+endif
+ifdef STLP_BUILD_FORCE_STATIC_RUNTIME
+release-shared: DEFS += -D_STLP_USE_DYNAMIC_LIB
+dbg-shared: DEFS += -D_STLP_USE_DYNAMIC_LIB
+stldbg-shared: DEFS += -D_STLP_USE_DYNAMIC_LIB
+endif
+endif
+
+# map output option (see build/Makefiles/gmake/dmc.mak)
+
+MAP_OUTPUT_OPTION =
+
+# dependency output parser (dependencies collector)
+
+DP_OUTPUT_DIR = | sed 's|\($*\)\.o[ :]*|$(OUTPUT_DIR)/\1.o $@ : |g' > $@; \
+ [ -s $@ ] || rm -f $@
+
+DP_OUTPUT_DIR_DBG = | sed 's|\($*\)\.o[ :]*|$(OUTPUT_DIR_DBG)/\1.o $@ : |g' > $@; \
+ [ -s $@ ] || rm -f $@
+
+DP_OUTPUT_DIR_STLDBG = | sed 's|\($*\)\.o[ :]*|$(OUTPUT_DIR_STLDBG)/\1.o $@ : |g' > $@; \
+ [ -s $@ ] || rm -f $@
+
Added: trunk/complement/explore/Makefiles/gmake/dmc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/dmc.mak (rev 0)
+++ trunk/complement/explore/Makefiles/gmake/dmc.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -0,0 +1,145 @@
+# Time-stamp: <07/05/31 01:03:50 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Copyright (c) 2006, 2007
+# Francois Dumont
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
+
+ALL_TAGS = all-static all-shared
+ifdef LIBNAME
+INSTALL_TAGS = install-static install-shared
+endif
+
+CXX := dmc
+CC := dmc
+RC := rcc
+
+DEFS ?=
+OPT ?=
+
+CFLAGS = -Ae -C -p -3 -w6 -w12
+CXXFLAGS = -Ae -C -p -3 -w12
+
+DEFS += -DSTRICT
+
+ifdef STLP_BUILD_FORCE_DYNAMIC_RUNTIME
+release-static : OPT += -ND
+dbg-static : OPT += -ND
+stldbg-static : OPT += -ND
+endif
+
+ifndef STLP_BUILD_FORCE_STATIC_RUNTIME
+release-shared : OPT += -ND
+dbg-shared : OPT += -ND
+stldbg-shared : OPT += -ND
+endif
+
+ifndef STLP_BUILD_NO_RTTI
+OPT += -Ar
+endif
+
+#Add Windows target.
+ifndef STLP_BUILD_WINDOWS_95
+WINVER=0x0410
+else
+WINVER=0x0400
+endif
+release-shared: DEFS += -DWINVER=$(WINVER)
+dbg-shared: DEFS += -DWINVER=$(WINVER)
+stldbg-shared: DEFS += -DWINVER=$(WINVER)
+release-static: DEFS += -DWINVER=$(WINVER)
+dbg-static: DEFS += -DWINVER=$(WINVER)
+stldbg-static: DEFS += -DWINVER=$(WINVER)
+
+OUTPUT_OPTION = -o$@
+LINK_OUTPUT_OPTION = $(subst /,\,$@)
+CPPFLAGS = $(DEFS) $(OPT) $(INCLUDES)
+
+CDEPFLAGS = -E -M
+CCDEPFLAGS = -E -M
+RCFLAGS = -32 -I${STLPORT_INCLUDE_DIR} -DCOMP=dmc
+
+release-shared : RCFLAGS += -DBUILD=r -DBUILD_INFOS="-o"
+dbg-shared : RCFLAGS += -DBUILD=g -DBUILD_INFOS="-gl -D_DEBUG"
+stldbg-shared : RCFLAGS += -DBUILD=stlg -DBUILD_INFOS="-gl -D_STLP_DEBUG"
+RC_OUTPUT_OPTION = $(OUTPUT_OPTION)
+
+COMPILE.rc = ${RC} ${RCFLAGS}
+LINK.cc = dm_link $(LDFLAGS)
+
+LDLIBS += user32.lib kernel32.lib
+
+# STLport DEBUG mode specific defines
+dbg-static : DEFS += -D_DEBUG
+dbg-shared : DEFS += -D_DEBUG
+stldbg-static : DEFS += -D_DEBUG
+stldbg-shared : DEFS += -D_DEBUG
+dbg-static-dep : DEFS += -D_DEBUG
+dbg-shared-dep : DEFS += -D_DEBUG
+stldbg-static : DEFS += -D_STLP_DEBUG
+stldbg-shared : DEFS += -D_STLP_DEBUG
+stldbg-static-dep : DEFS += -D_STLP_DEBUG
+stldbg-shared-dep : DEFS += -D_STLP_DEBUG
+
+# optimization and debug compiler flags
+release-static : OPT += -o
+release-shared : OPT += -o
+dbg-static : OPT += -gl
+dbg-shared : OPT += -gl
+stldbg-static : OPT += -gl
+stldbg-shared : OPT += -gl
+
+release-static : OPT += -D_MT
+dbg-static : OPT += -D_MT
+stldbg-static : OPT += -D_MT
+
+release-static : AR += -p128
+dbg-static : AR += -p512
+stldbg-static : AR += -p512
+
+ifndef LIBNAME
+ifdef STLP_BUILD_FORCE_DYNAMIC_RUNTIME
+release-static: DEFS += -D_STLP_USE_STATIC_LIB
+dbg-static: DEFS += -D_STLP_USE_STATIC_LIB
+stldbg-static: DEFS += -D_STLP_USE_STATIC_LIB
+endif
+ifdef STLP_BUILD_FORCE_STATIC_RUNTIME
+release-shared: DEFS += -D_STLP_USE_DYNAMIC_LIB
+dbg-shared: DEFS += -D_STLP_USE_DYNAMIC_LIB
+stldbg-shared: DEFS += -D_STLP_USE_DYNAMIC_LIB
+endif
+endif
+
+# map output option (move map files to output dir)
+
+ifdef LIBNAME
+release-shared: MAP_OUTPUT_OPTION = $(subst /,\,$(OUTPUT_DIR))\$(SO_NAME_BASE).map
+dbg-shared: MAP_OUTPUT_OPTION = $(subst /,\,$(OUTPUT_DIR_DBG))\$(SO_NAME_DBG_BASE).map
+stldbg-shared: MAP_OUTPUT_OPTION = $(subst /,\,$(OUTPUT_DIR_STLDBG))\$(SO_NAME_STLDBG_BASE).map
+else
+release-shared: MAP_OUTPUT_OPTION = $(subst /,\,$(OUTPUT_DIR))\$(PRGNAME).map
+release-static: MAP_OUTPUT_OPTION = $(subst /,\,$(OUTPUT_DIR))\$(PRGNAME).map
+dbg-shared: MAP_OUTPUT_OPTION = $(subst /,\,$(OUTPUT_DIR_DBG))\$(PRGNAME).map
+dbg-static: MAP_OUTPUT_OPTION = $(subst /,\,$(OUTPUT_DIR_DBG))\$(PRGNAME).map
+stldbg-shared: MAP_OUTPUT_OPTION = $(subst /,\,$(OUTPUT_DIR_STLDBG))\$(PRGNAME).map
+stldbg-static: MAP_OUTPUT_OPTION = $(subst /,\,$(OUTPUT_DIR_STLDBG))\$(PRGNAME).map
+endif
+
+# dependency output parser (dependencies collector)
+
+DP_OUTPUT_DIR = | sed 's|\($*\)\.o[ :]*|$(OUTPUT_DIR)/\1.o $@ : |g' > $@; \
+ [ -s $@ ] || rm -f $@
+
+DP_OUTPUT_DIR_DBG = | sed 's|\($*\)\.o[ :]*|$(OUTPUT_DIR_DBG)/\1.o $@ : |g' > $@; \
+ [ -s $@ ] || rm -f $@
+
+DP_OUTPUT_DIR_STLDBG = | sed 's|\($*\)\.o[ :]*|$(OUTPUT_DIR_STLDBG)/\1.o $@ : |g' > $@; \
+ [ -s $@ ] || rm -f $@
+
Modified: trunk/complement/explore/Makefiles/gmake/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/gcc.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/gcc.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,4 +1,4 @@
-# Time-stamp: <06/11/10 15:53:35 ptr>
+# Time-stamp: <07/05/31 01:25:52 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -21,7 +21,7 @@
CC := $_FORCE_CC
endif
-ifeq ($(OSNAME), cygming)
+ifeq ($(OSNAME), windows)
RC := windres
endif
@@ -37,7 +37,13 @@
CXX_VERSION_MAJOR := $(shell ${CXX} -dumpversion | awk 'BEGIN { FS = "."; } { print $1; }')
CXX_VERSION_MINOR := $(shell ${CXX} -dumpversion | awk 'BEGIN { FS = "."; } { print $2; }')
CXX_VERSION_PATCH := $(shell ${CXX} -dumpversion | awk 'BEGIN { FS = "."; } { print $3; }')
+# This is to differentiate Apple-builded compiler from original
+# compiler (it's has different behaviour)
+ifneq ("$(shell ${CXX} -v 2>&1 | grep Apple)", "")
+GCC_APPLE_CC := 1
+endif
else
+ifneq ($(OSNAME), windows)
CXX_VERSION := $(shell ${CXX} --version | grep GCC | awk '{ print $$3; }')
ifeq ($(CXX_VERSION),)
@@ -49,6 +55,7 @@
CXX_VERSION_MINOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$2; }')
CXX_VERSION_PATCH := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$3; }')
endif
+endif
DEFS ?=
OPT ?=
@@ -63,12 +70,13 @@
LINK_OUTPUT_OPTION = ${OUTPUT_OPTION}
CPPFLAGS = $(DEFS) $(INCLUDES)
-ifeq ($(OSNAME), cygming)
-release-shared : RCFLAGS = --include-dir=${STLPORT_INCLUDE_DIR} -DCOMP=gcc -DBUILD=r -DBUILD_INFOS="-O2" --output-format coff
-dbg-shared : RCFLAGS = --include-dir=${STLPORT_INCLUDE_DIR} -DCOMP=gcc -DBUILD=d -DBUILD_INFOS="-g" --output-format coff
-stldbg-shared : RCFLAGS = --include-dir=${STLPORT_INCLUDE_DIR} -DCOMP=gcc -DBUILD=stld -DBUILD_INFOS="-g -D_STLP_DEBUG" --output-format coff
+ifeq ($(OSNAME), windows)
+RCFLAGS = --include-dir=${STLPORT_INCLUDE_DIR} --output-format coff -DCOMP=gcc
+release-shared : RCFLAGS += -DBUILD_INFOS=-O2
+dbg-shared : RCFLAGS += -DBUILD=g -DBUILD_INFOS=-g
+stldbg-shared : RCFLAGS += -DBUILD=stlg -DBUILD_INFOS="-g -D_STLP_DEBUG"
RC_OUTPUT_OPTION = -o $@
-CXXFLAGS = -Wall -Wsign-promo -fexceptions -fident
+CXXFLAGS = -Wall -Wsign-promo -Wcast-qual -fexceptions -fident
ifeq ($(OSREALNAME), mingw)
CCFLAGS += -mthreads
CFLAGS += -mthreads
@@ -80,21 +88,22 @@
CFLAGS += $(OPT)
CXXFLAGS += $(OPT)
COMPILE.rc = $(RC) $(RCFLAGS)
+
+#Add Windows target.
+ifdef STLP_BUILD_WINDOWS_95
+WINVER=0x0400
+else
+WINVER=0x0410
endif
-ifeq ($(OSNAME), windows)
-release-shared : RCFLAGS = --include-dir=${STLPORT_INCLUDE_DIR} -DCOMP=gcc -DBUILD=r -DBUILD_INFOS="-O2" --output-format coff
-dbg-shared : RCFLAGS = --include-dir=${STLPORT_INCLUDE_DIR} -DCOMP=gcc -DBUILD=d -DBUILD_INFOS="-g" --output-format coff
-stldbg-shared : RCFLAGS = --include-dir=${STLPORT_INCLUDE_DIR} -DCOMP=gcc -DBUILD=stld -DBUILD_INFOS="-g -D_STLP_DEBUG" --output-format coff
-RC_OUTPUT_OPTION = -o $@
-CXXFLAGS = -Wall -Wsign-promo -fexceptions -fident
-CCFLAGS += -mthreads
-CFLAGS += -mthreads
-CXXFLAGS += -mthreads
-CCFLAGS += $(OPT)
-CFLAGS += $(OPT)
-CXXFLAGS += $(OPT)
-COMPILE.rc = $(RC) $(RCFLAGS)
+release-static : DEFS += -D_STLP_USE_STATIC_LIB -DWINVER=$(WINVER)
+dbg-static : DEFS += -D_DEBUG -D_STLP_USE_STATIC_LIB -DWINVER=$(WINVER)
+stldbg-static : DEFS += -D_DEBUG -D_STLP_USE_STATIC_LIB -DWINVER=$(WINVER)
+
+release-shared: DEFS += -DWINVER=$(WINVER)
+dbg-shared : DEFS += -D_DEBUG -DWINVER=$(WINVER)
+stldbg-shared : DEFS += -D_DEBUG -DWINVER=$(WINVER)
+
endif
ifeq ($(OSNAME),sunos)
@@ -159,15 +168,11 @@
endif
# Required for correct order of static objects dtors calls:
-ifneq ($(OSNAME),cygming)
-ifneq ($(OSNAME),windows)
-ifneq ($(OSNAME),darwin)
+ifeq ("$(findstring $(OSNAME),darwin windows)","")
ifneq ($(CXX_VERSION_MAJOR),2)
CXXFLAGS += -fuse-cxa-atexit
endif
endif
-endif
-endif
# Code should be ready for this option
#ifneq ($(OSNAME),windows)
Modified: trunk/complement/explore/Makefiles/gmake/hp-ux/sys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/hp-ux/sys.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/hp-ux/sys.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,10 +1,21 @@
-# Time-stamp: <05/09/09 21:12:16 ptr>
-# $Id$
+# Time-stamp: <07/05/31 00:47:11 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Copyright (c) 2006, 2007
+# Francois Dumont
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
-INSTALL := $$HOME/bin/install-sh
+INSTALL := cp
-INSTALL_SO := ${INSTALL} -c -m 0755
-INSTALL_A := ${INSTALL} -c -m 0644
-INSTALL_EXE := ${INSTALL} -c -m 0755
+INSTALL_SO := ${INSTALL}
+INSTALL_A := ${INSTALL}
+INSTALL_EXE := ${INSTALL}
EXT_TEST := /usr/bin/test
Modified: trunk/complement/explore/Makefiles/gmake/hp-ux/targetsys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/hp-ux/targetsys.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/hp-ux/targetsys.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,5 +1,13 @@
-# Time-stamp: <05/09/09 21:05:18 ptr>
-# $Id$
+# Time-stamp: <07/05/31 00:48:27 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
SO := sl
Modified: trunk/complement/explore/Makefiles/gmake/lib/aCC.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/aCC.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/lib/aCC.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <07/03/08 21:38:16 ptr>
+# -*- makefile -*- Time-stamp: <07/05/31 00:50:40 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
# Petr Ovtchenkov
@@ -9,6 +9,6 @@
# Licensed under the Academic Free License version 3.0
#
-dbg-shared: LDFLAGS += -shared -Wl,-C20 -Wl,-dynamic -Wl,+h$(SO_NAME_DBGxx) ${LDSEARCH}
-stldbg-shared: LDFLAGS += -shared -Wl,-C20 -Wl,-dynamic -Wl,+h$(SO_NAME_STLDBGxx) ${LDSEARCH}
-release-shared: LDFLAGS += -shared -Wl,-C20 -Wl,-dynamic -Wl,+h$(SO_NAMExx) ${LDSEARCH}
+dbg-shared: LDFLAGS += -b +nostl -Wl,+h$(SO_NAME_DBGxx) ${LDSEARCH}
+stldbg-shared: LDFLAGS += -b +nostl -Wl,+h$(SO_NAME_STLDBGxx) ${LDSEARCH}
+release-shared: LDFLAGS += -b +nostl -Wl,+h$(SO_NAMExx) ${LDSEARCH}
Added: trunk/complement/explore/Makefiles/gmake/lib/bcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/bcc.mak (rev 0)
+++ trunk/complement/explore/Makefiles/gmake/lib/bcc.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -0,0 +1,35 @@
+# -*- makefile -*- Time-stamp: <07/05/31 01:29:22 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Copyright (c) 2006, 2007
+# Francois Dumont
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
+
+release-shared : OPT += -tWD
+dbg-shared : OPT += -tWD
+stldbg-shared : OPT += -tWD
+
+release-shared : LDFLAGS += -Tpd -V4.00 -w -w-dup
+dbg-shared : LDFLAGS += -Tpd -V4.00 -v -w -w-dup
+stldbg-shared : LDFLAGS += -Tpd -V4.00 -v -w -w-dup
+
+START_OBJ := c0d32.obj
+
+install-dbg-shared: install-dbg-shared-tds
+install-stldbg-shared: install-stldbg-shared-tds
+
+TDS_LIBNAME_DBG := $(LIB_PREFIX)${LIBNAME}${DBG_SUFFIX}${LIB_TYPE}${LIB_SUFFIX}.tds
+TDS_LIBNAME_STLDBG := $(LIB_PREFIX)${LIBNAME}${STLDBG_SUFFIX}${LIB_TYPE}${LIB_SUFFIX}.tds
+
+install-dbg-shared-tds:
+ $(INSTALL_SO) $(subst /,\,$(OUTPUT_DIR_DBG)/${TDS_LIBNAME_DBG} $(INSTALL_BIN_DIR)/)
+
+install-stldbg-shared-tds:
+ $(INSTALL_SO) $(subst /,\,$(OUTPUT_DIR_STLDBG)/${TDS_LIBNAME_STLDBG} $(INSTALL_BIN_DIR)/)
Modified: trunk/complement/explore/Makefiles/gmake/lib/clean.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/clean.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/lib/clean.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <06/11/17 00:39:31 ptr>
+# -*- makefile -*- Time-stamp: <07/05/30 23:55:47 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -26,7 +26,7 @@
@-rm -f $${$(1)_A_NAME_OUT}
@-rm -f $${$(1)_A_NAME_OUT_DBG}
@-rm -f $${$(1)_A_NAME_OUT_STLDBG}
-ifeq ($(OSNAME), cygming)
+ifeq ($(OSNAME), windows)
@-rm -f $${$(1)_LIB_NAME_OUT}
@-rm -f $${$(1)_LIB_NAME_OUT_DBG}
@-rm -f $${$(1)_LIB_NAME_OUT_STLDBG}
@@ -73,7 +73,7 @@
@-rm -f ${A_NAME_OUT}
@-rm -f ${A_NAME_OUT_DBG}
@-rm -f ${A_NAME_OUT_STLDBG}
-ifeq ($(OSNAME), cygming)
+ifeq ($(OSNAME), windows)
@-rm -f ${LIB_NAME_OUT}
@-rm -f ${LIB_NAME_OUT_DBG}
@-rm -f ${LIB_NAME_OUT_STLDBG}
Added: trunk/complement/explore/Makefiles/gmake/lib/dmc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/dmc.mak (rev 0)
+++ trunk/complement/explore/Makefiles/gmake/lib/dmc.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -0,0 +1,25 @@
+# -*- makefile -*- Time-stamp: <07/05/31 01:29:36 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Copyright (c) 2006, 2007
+# Francois Dumont
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
+
+release-shared: OPT += -WD
+dbg-shared: OPT += -WD
+stldbg-shared: OPT += -WD
+
+release-shared: LDFLAGS += /IMPLIB:$(subst /,\,$(OUTPUT_DIR))\$(SO_NAME_BASE).lib
+dbg-shared: LDFLAGS += /CODEVIEW/IMPLIB:$(subst /,\,$(OUTPUT_DIR_DBG))\$(SO_NAME_DBG_BASE).lib
+stldbg-shared: LDFLAGS += /CODEVIEW/IMPLIB:$(subst /,\,$(OUTPUT_DIR_STLDBG))\$(SO_NAME_STLDBG_BASE).lib
+
+DEF_OPTION = $(subst /,\,$(OUTPUT_DIR))\$(SO_NAME_BASE).def
+DEF_OPTION_DBG = $(subst /,\,$(OUTPUT_DIR_DBG))\$(SO_NAME_DBG_BASE).def
+DEF_OPTION_STLDBG = $(subst /,\,$(OUTPUT_DIR_STLDBG))\$(SO_NAME_STLDBG_BASE).def
Modified: trunk/complement/explore/Makefiles/gmake/lib/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/gcc.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/lib/gcc.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <07/03/08 21:26:20 ptr>
+# -*- makefile -*- Time-stamp: <07/05/31 00:55:13 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
# Petr Ovtchenkov
@@ -14,7 +14,9 @@
# tag with assignment fail, but work assignment for all tags
# (really that more correct).
+ifneq ($(OSNAME), windows)
OPT += -fPIC
+endif
ifndef NOT_USE_NOSTDLIB
@@ -62,7 +64,11 @@
ifeq ($(OSNAME),sunos)
_USE_NOSTDLIB := 1
endif
+
+ifeq ($(OSNAME),darwin)
+_USE_NOSTDLIB := 1
endif
+endif
ifndef WITHOUT_STLPORT
LDSEARCH += -L${STLPORT_LIB_DIR}
@@ -71,13 +77,6 @@
dbg-shared: STLPORT_LIB = -lstlportg
stldbg-shared: STLPORT_LIB = -lstlportstlg
-ifeq ($(OSNAME),cygming)
-LIB_VERSION = ${LIBMAJOR}.${LIBMINOR}
-release-shared : STLPORT_LIB = -lstlport.${LIB_VERSION}
-dbg-shared : STLPORT_LIB = -lstlportg.${LIB_VERSION}
-stldbg-shared : STLPORT_LIB = -lstlportstlg.${LIB_VERSION}
-endif
-
ifeq ($(OSNAME),windows)
LIB_VERSION = ${LIBMAJOR}.${LIBMINOR}
release-shared : STLPORT_LIB = -lstlport.${LIB_VERSION}
@@ -139,6 +138,16 @@
END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} -print-file-name=$$o; done)
STDLIBS := ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm -lrt
endif
+ifeq ($(OSNAME),darwin)
+START_OBJ :=
+END_OBJ :=
+ifdef GCC_APPLE_CC
+STDLIBS := ${STLPORT_LIB} -lgcc -lc -lm
+else
+LDFLAGS += -single_module
+STDLIBS := ${STLPORT_LIB} ${_LGCC_S} -lc -lm
+endif
+endif
#END_A_OBJ := $(shell for o in crtn.o; do ${CXX} -print-file-name=$$o; done)
NOSTDLIB := -nostdlib
# endif
@@ -151,9 +160,9 @@
endif
ifeq ($(OSNAME),hp-ux)
-dbg-shared: LDFLAGS += -shared -Wl,-C20 -Wl,-dynamic -Wl,+h$(SO_NAME_DBGxx) ${LDSEARCH}
-stldbg-shared: LDFLAGS += -shared -Wl,-C20 -Wl,-dynamic -Wl,+h$(SO_NAME_STLDBGxx) ${LDSEARCH}
-release-shared: LDFLAGS += -shared -Wl,-C20 -Wl,-dynamic -Wl,+h$(SO_NAMExx) ${LDSEARCH}
+dbg-shared: LDFLAGS += -shared -Wl,-dynamic -Wl,+h$(SO_NAME_DBGxx) ${LDSEARCH}
+stldbg-shared: LDFLAGS += -shared -Wl,-dynamic -Wl,+h$(SO_NAME_STLDBGxx) ${LDSEARCH}
+release-shared: LDFLAGS += -shared -Wl,-dynamic -Wl,+h$(SO_NAMExx) ${LDSEARCH}
endif
ifeq ($(OSNAME),sunos)
@@ -174,11 +183,10 @@
release-static: LDFLAGS += ${LDSEARCH}
endif
-ifeq ($(OSNAME),cygming)
-OPT :=
-dbg-shared: LDFLAGS += -shared -Wl,--out-implib=${LIB_NAME_OUT_DBG},--export-all-symbols,--disable-auto-import
-stldbg-shared: LDFLAGS += -shared -Wl,--out-implib=${LIB_NAME_OUT_STLDBG},--export-all-symbols
-release-shared: LDFLAGS += -shared -Wl,--out-implib=${LIB_NAME_OUT},--export-all-symbols
+ifeq ($(OSNAME),windows)
+dbg-shared: LDFLAGS += -shared -Wl,--out-implib=${LIB_NAME_OUT_DBG},--enable-auto-image-base
+stldbg-shared: LDFLAGS += -shared -Wl,--out-implib=${LIB_NAME_OUT_STLDBG},--enable-auto-image-base
+release-shared: LDFLAGS += -shared -Wl,--out-implib=${LIB_NAME_OUT},--enable-auto-image-base
dbg-static: LDFLAGS += -static ${LDSEARCH}
stldbg-static: LDFLAGS += -static ${LDSEARCH}
release-static: LDFLAGS += -static ${LDSEARCH}
@@ -197,9 +205,9 @@
CURRENT_VERSION := ${MAJOR}.${MINOR}.${PATCH}
COMPATIBILITY_VERSION := $(CURRENT_VERSION)
-dbg-shared: LDFLAGS += -dynamiclib -compatibility_version $(COMPATIBILITY_VERSION) -current_version $(CURRENT_VERSION) -install_name $(SO_NAME_DBGxx) -Wl ${LDSEARCH}
-stldbg-shared: LDFLAGS += -dynamiclib -compatibility_version $(COMPATIBILITY_VERSION) -current_version $(CURRENT_VERSION) -install_name $(SO_NAME_STLDBGxx) -Wl ${LDSEARCH}
-release-shared: LDFLAGS += -dynamiclib -compatibility_version $(COMPATIBILITY_VERSION) -current_version $(CURRENT_VERSION) -install_name $(SO_NAMExx) -Wl ${LDSEARCH}
+dbg-shared: LDFLAGS += -dynamic -dynamiclib -compatibility_version $(COMPATIBILITY_VERSION) -current_version $(CURRENT_VERSION) -install_name $(SO_NAME_DBGxx) ${LDSEARCH} ${NOSTDLIB}
+stldbg-shared: LDFLAGS += -dynamic -dynamiclib -compatibility_version $(COMPATIBILITY_VERSION) -current_version $(CURRENT_VERSION) -install_name $(SO_NAME_STLDBGxx) ${LDSEARCH} ${NOSTDLIB}
+release-shared: LDFLAGS += -dynamic -dynamiclib -compatibility_version $(COMPATIBILITY_VERSION) -current_version $(CURRENT_VERSION) -install_name $(SO_NAMExx) ${LDSEARCH} ${NOSTDLIB}
dbg-static: LDFLAGS += -staticlib ${LDSEARCH}
stldbg-static: LDFLAGS += -staticlib ${LDSEARCH}
release-static: LDFLAGS += -staticlib ${LDSEARCH}
Modified: trunk/complement/explore/Makefiles/gmake/sysid.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/sysid.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/sysid.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,4 +1,4 @@
-# Time-stamp: <07/03/08 21:43:48 ptr>
+# Time-stamp: <07/05/30 23:51:19 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
# Petr Ovtchenkov
@@ -17,12 +17,12 @@
# RedHat use nonstandard options for uname at least in cygwin,
# macro should be overwritten:
ifeq (cygwin,$(findstring cygwin,$(OSNAME)))
-OSNAME := cygming
+OSNAME := windows
OSREALNAME := $(shell uname -o | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
endif
ifeq (mingw,$(findstring mingw,$(OSNAME)))
-OSNAME := cygming
+OSNAME := windows
OSREALNAME := mingw
endif
@@ -61,12 +61,12 @@
# RedHat use nonstandard options for uname at least in cygwin,
# macro should be overwritten:
ifeq (cygwin,$(findstring cygwin,$(BUILD_OSNAME)))
-BUILD_OSNAME := cygming
+BUILD_OSNAME := windows
BUILD_OSREALNAME := $(shell uname -o | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
endif
ifeq (mingw,$(findstring mingw,$(BUILD_OSNAME)))
-BUILD_OSNAME := cygming
+BUILD_OSNAME := windows
BUILD_OSREALNAME := mingw
endif
Modified: trunk/complement/explore/Makefiles/gmake/targets.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/targets.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/targets.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,4 +1,4 @@
-# Time-stamp: <06/11/17 10:29:59 ptr>
+# Time-stamp: <07/05/30 23:59:42 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -46,7 +46,7 @@
# if sources disposed in several dirs, calculate appropriate rules
DIRS_UNIQUE_SRC := $(dir $(SRC_CPP) $(SRC_CC) $(SRC_CXX) $(SRC_C) $(SRC_S) )
-ifeq (${OSNAME},cygming)
+ifeq (${OSNAME},windows)
DIRS_UNIQUE_SRC := ${DIRS_UNIQUE_SRC} $(dir $(SRC_RC) )
endif
DIRS_UNIQUE_SRC := $(sort $(DIRS_UNIQUE_SRC) $(PRGS_DIR_SRC))
@@ -111,7 +111,7 @@
$(call rule_o,_A_STLDBG,$(1))
endif
endif
-ifeq ($(OSNAME),cygming)
+ifeq ($(OSNAME),windows)
$(call rule_rc,,$(1))
$(call rule_rc,_DBG,$(1))
ifndef WITHOUT_STLPORT
@@ -123,7 +123,7 @@
$(foreach dir,$(DIRS_UNIQUE_SRC),$(eval $(call rules_,$(dir))))
ALLBASE := $(basename $(notdir $(SRC_CC) $(SRC_CPP) $(SRC_CXX) $(SRC_C) $(SRC_S)))
-ifeq (${OSNAME},cygming)
+ifeq (${OSNAME},windows)
RCBASE += $(basename $(notdir $(SRC_RC)))
endif
Modified: trunk/complement/explore/Makefiles/gmake/windows/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/windows/rules-install-so.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/windows/rules-install-so.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,5 +1,16 @@
-# -*- makefile -*- Time-stamp: <03/07/15 18:26:22 ptr>
-# $Id$
+# -*- makefile -*- Time-stamp: <07/05/31 00:12:45 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Copyright (c) 2006, 2007
+# Francois Dumont
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
INSTALL_TAGS ?= install-shared
Modified: trunk/complement/explore/Makefiles/gmake/windows/rules-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/windows/rules-so.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/windows/rules-so.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,5 +1,16 @@
-# -*- makefile -*- Time-stamp: <03/10/27 18:15:05 ptr>
-# $Id$
+# -*- makefile -*- Time-stamp: <07/05/31 00:13:32 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Copyright (c) 2006, 2007
+# Francois Dumont
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
# Shared libraries tags
Modified: trunk/complement/explore/Makefiles/gmake/windows/sys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/windows/sys.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/windows/sys.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,11 +1,31 @@
-# Time-stamp: <05/09/09 21:12:38 ptr>
-# $Id$
+# Time-stamp: <07/05/31 00:10:23 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Copyright (c) 2006, 2007
+# Francois Dumont
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
RC := windres
+
+ifeq ($(OSREALNAME),cygwin)
+INSTALL := install
+
+INSTALL_SO := ${INSTALL} -m 0755
+INSTALL_A := ${INSTALL} -m 0644
+INSTALL_EXE := ${INSTALL} -m 0755
+else
INSTALL := copy
INSTALL_SO := ${INSTALL}
INSTALL_A := ${INSTALL}
INSTALL_EXE := ${INSTALL}
+endif
EXT_TEST := test
Modified: trunk/complement/explore/Makefiles/gmake/windows/targetsys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/windows/targetsys.mak 2007-05-30 11:35:35 UTC (rev 1574)
+++ trunk/complement/explore/Makefiles/gmake/windows/targetsys.mak 2007-05-31 04:34:01 UTC (rev 1575)
@@ -1,4 +1,51 @@
-# Time-stamp: <05/09/09 21:03:45 ptr>
-# $Id$
+# Time-stamp: <07/05/31 00:07:23 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Copyright (c) 2006, 2007
+# Francois Dumont
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
-include $(SRCROOT)/Makefiles/gmake/cygming/targetsys.mak
+CC ?= gcc
+CXX ?= g++
+
+# shared library:
+SO := dll
+ifeq (gcc,$(COMPILER_NAME))
+LIB := dll.a
+else
+LIB := lib
+endif
+
+EXP := exp
+# executable:
+EXE := .exe
+
+# static library extention:
+ifeq (dmc,$(COMPILER_NAME))
+ARCH := lib
+AR := dm_lib -n
+AR_INS_R := -c
+AR_EXTR := -x
+AR_OUT = $(subst /,\,$@)
+else
+ifeq (bcc,$(COMPILER_NAME))
+ARCH := lib
+AR := tlib
+AR_INS_R := +
+AR_EXTR := *
+AR_OUT = $(subst /,\,$@)
+else
+ARCH := a
+AR := ar
+AR_INS_R := -rs
+AR_EXTR := -x
+AR_OUT = $@
+endif
+endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-07-12 07:13:04
|
Revision: 1607
http://svn.sourceforge.net/complement/?rev=1607&view=rev
Author: complement
Date: 2007-07-12 00:12:59 -0700 (Thu, 12 Jul 2007)
Log Message:
-----------
add include option for boost's headers, if BOOST_DIR defined
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
trunk/complement/explore/Makefiles/gmake/gcc.mak
trunk/complement/explore/Makefiles/gmake/top.mak
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2007-07-11 21:01:08 UTC (rev 1606)
+++ trunk/complement/explore/Makefiles/ChangeLog 2007-07-12 07:12:59 UTC (rev 1607)
@@ -1,3 +1,8 @@
+2007-07-12 Petr Ovtchenkov <pt...@is...>
+
+ * gmake/gcc.mak, gmake/top.mak: add include option for boost's
+ headers, if BOOST_DIR defined.
+
2007-06-08 Petr Ovtchenkov <pt...@is...>
* clean.mak, extern.mak, config.mak: move to gmake catalog
Modified: trunk/complement/explore/Makefiles/gmake/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/gcc.mak 2007-07-11 21:01:08 UTC (rev 1606)
+++ trunk/complement/explore/Makefiles/gmake/gcc.mak 2007-07-12 07:12:59 UTC (rev 1607)
@@ -1,4 +1,4 @@
-# Time-stamp: <07/05/31 01:25:52 ptr>
+# Time-stamp: <07/07/12 10:51:42 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -66,6 +66,10 @@
INCLUDES = -I${STLPORT_INCLUDE_DIR}
endif
+ifdef BOOST_INCLUDE_DIR
+INCLUDES += -I${BOOST_INCLUDE_DIR}
+endif
+
OUTPUT_OPTION = -o $@
LINK_OUTPUT_OPTION = ${OUTPUT_OPTION}
CPPFLAGS = $(DEFS) $(INCLUDES)
Modified: trunk/complement/explore/Makefiles/gmake/top.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/top.mak 2007-07-11 21:01:08 UTC (rev 1606)
+++ trunk/complement/explore/Makefiles/gmake/top.mak 2007-07-12 07:12:59 UTC (rev 1607)
@@ -1,4 +1,4 @@
-# Time-stamp: <07/06/08 23:23:03 ptr>
+# Time-stamp: <07/07/12 10:55:41 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
# Petr Ovtchenkov
@@ -81,12 +81,12 @@
include ${RULESBASE}/gmake/$(BUILD_OSNAME)/sys.mak
# target OS-specific definitions, like ar, etc.
include ${RULESBASE}/gmake/$(OSNAME)/targetsys.mak
+# Extern projects for everyday usage and settings for ones
+include ${RULESBASE}/gmake/extern.mak
# compiler, compiler options
include ${RULESBASE}/gmake/$(COMPILER_NAME).mak
# rules to make dirs for targets
include ${RULESBASE}/gmake/targetdirs.mak
-# Extern projects for everyday usage and settings for ones
-include ${RULESBASE}/gmake/extern.mak
# os-specific local rules (or other project-specific definitions)
-include specific.mak
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-08-08 10:10:01
|
Revision: 1677
http://complement.svn.sourceforge.net/complement/?rev=1677&view=rev
Author: complement
Date: 2007-08-08 03:09:58 -0700 (Wed, 08 Aug 2007)
Log Message:
-----------
gmake/app/rules.mak: use special link string for Digital Mars
and Borland compilers, due to special pass of options and files
to linker for this OE;
gmake/gcc.mak, gmake/dmc.mak: use STLport's experience;
gmake/lib/gcc.mak: gcc 3.3 also may have bad libsupc++.
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
trunk/complement/explore/Makefiles/gmake/app/rules.mak
trunk/complement/explore/Makefiles/gmake/dmc.mak
trunk/complement/explore/Makefiles/gmake/gcc.mak
trunk/complement/explore/Makefiles/gmake/lib/gcc.mak
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2007-08-06 11:18:14 UTC (rev 1676)
+++ trunk/complement/explore/Makefiles/ChangeLog 2007-08-08 10:09:58 UTC (rev 1677)
@@ -1,3 +1,13 @@
+2007-08-08 Petr Ovtchenkov <pt...@is...>
+
+ * gmake/app/rules.mak: use special link string for Digital Mars
+ and Borland compilers, due to special pass of options and files
+ to linker for this OE;
+
+ * gmake/gcc.mak, gmake/dmc.mak: use STLport's experience;
+
+ * gmake/lib/gcc.mak: gcc 3.3 also may have bad libsupc++.
+
2007-07-12 Petr Ovtchenkov <pt...@is...>
* gmake/gcc.mak, gmake/top.mak: add include option for boost's
Modified: trunk/complement/explore/Makefiles/gmake/app/rules.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/rules.mak 2007-08-06 11:18:14 UTC (rev 1676)
+++ trunk/complement/explore/Makefiles/gmake/app/rules.mak 2007-08-08 10:09:58 UTC (rev 1677)
@@ -1,6 +1,6 @@
# -*- makefile -*- Time-stamp: <06/11/17 10:34:26 ptr>
#
-# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
# Petr Ovtchenkov
#
# Portion Copyright (c) 1999-2001
@@ -23,17 +23,27 @@
stldbg-static: $(EXTRA_PRE_STLDBG) $(OUTPUT_DIR_STLDBG) ${PRG_STLDBG} ${ALLPRGS_STLDBG} $(EXTRA_POST_STLDBG)
endif
+ifeq ("$(findstring $(OSNAME),bcc dmc)","")
+define cpplnk_str
+$(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(1) $(LDLIBS) ${STDLIBS} ${END_OBJ}
+endef
+else
+define cpplnk_str
+$(LINK.cc) $(subst /,\,${START_OBJ} $(1) ${END_OBJ}, $(LINK_OUTPUT_OPTION), $(MAP_OUTPUT_OPTION), $(LDLIBS) ${STDLIBS},,)
+endef
+endif
+
define prog_lnk
ifeq ($${_$(1)_C_SOURCES_ONLY},)
$${$(1)_PRG}: $$($(1)_OBJ) $$(LIBSDEP)
- $$(LINK.cc) $$(LINK_OUTPUT_OPTION) $${START_OBJ} $$($(1)_OBJ) $$(LDLIBS) $${STDLIBS} $${END_OBJ}
+ $$(call cpplnk_str,$$($(1)_OBJ))
$${$(1)_PRG_DBG}: $$($(1)_OBJ_DBG) $$(LIBSDEP)
- $$(LINK.cc) $$(LINK_OUTPUT_OPTION) $${START_OBJ} $$($(1)_OBJ_DBG) $$(LDLIBS) $${STDLIBS} $${END_OBJ}
+ $$(call cpplnk_str,$$($(1)_OBJ_DBG))
ifndef WITHOUT_STLPORT
$${$(1)_PRG_STLDBG}: $$($(1)_OBJ_STLDBG) $$(LIBSDEP)
- $$(LINK.cc) $$(LINK_OUTPUT_OPTION) $${START_OBJ} $$($(1)_OBJ_STLDBG) $$(LDLIBS) $${STDLIBS} $${END_OBJ}
+ $$(call cpplnk_str,$$($(1)_OBJ_STLDBG))
endif
else
$${$(1)_PRG}: $$($(1)_OBJ) $$(LIBSDEP)
@@ -53,14 +63,14 @@
ifeq ("${_C_SOURCES_ONLY}","")
${PRG}: $(OBJ) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ) $(LDLIBS) ${STDLIBS} ${END_OBJ}
+ $(call cpplnk_str,$(OBJ))
${PRG_DBG}: $(OBJ_DBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_DBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
+ $(call cpplnk_str,$(OBJ_DBG))
ifndef WITHOUT_STLPORT
${PRG_STLDBG}: $(OBJ_STLDBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_STLDBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
+ $(call cpplnk_str,$(OBJ_STLDBG))
endif
else
${PRG}: $(OBJ) $(LIBSDEP)
Modified: trunk/complement/explore/Makefiles/gmake/dmc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/dmc.mak 2007-08-06 11:18:14 UTC (rev 1676)
+++ trunk/complement/explore/Makefiles/gmake/dmc.mak 2007-08-08 10:09:58 UTC (rev 1677)
@@ -19,7 +19,6 @@
CXX := dmc
CC := dmc
-RC := rcc
DEFS ?=
OPT ?=
@@ -64,7 +63,7 @@
CDEPFLAGS = -E -M
CCDEPFLAGS = -E -M
-RCFLAGS = -32 -I${STLPORT_INCLUDE_DIR} -DCOMP=dmc
+RCFLAGS = --include-dir=${STLPORT_INCLUDE_DIR} -DCOMP=dmc
release-shared : RCFLAGS += -DBUILD=r -DBUILD_INFOS="-o"
dbg-shared : RCFLAGS += -DBUILD=g -DBUILD_INFOS="-gl -D_DEBUG"
Modified: trunk/complement/explore/Makefiles/gmake/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/gcc.mak 2007-08-06 11:18:14 UTC (rev 1676)
+++ trunk/complement/explore/Makefiles/gmake/gcc.mak 2007-08-08 10:09:58 UTC (rev 1677)
@@ -43,7 +43,6 @@
GCC_APPLE_CC := 1
endif
else
-ifneq ($(OSNAME), windows)
CXX_VERSION := $(shell ${CXX} --version | grep GCC | awk '{ print $$3; }')
ifeq ($(CXX_VERSION),)
@@ -55,7 +54,6 @@
CXX_VERSION_MINOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$2; }')
CXX_VERSION_PATCH := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$3; }')
endif
-endif
DEFS ?=
OPT ?=
Modified: trunk/complement/explore/Makefiles/gmake/lib/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/gcc.mak 2007-08-06 11:18:14 UTC (rev 1676)
+++ trunk/complement/explore/Makefiles/gmake/lib/gcc.mak 2007-08-08 10:09:58 UTC (rev 1677)
@@ -30,7 +30,7 @@
endif
ifeq ($(CXX_VERSION_MAJOR),3)
-# gcc before 3.3 (i.e. 3.0.x, 3.1.x, 3.2.x) has buggy libsupc++, so we should link with libstdc++ to avoid one
+# gcc before 3.4 (i.e. 3.0.x, 3.1.x, 3.2.x) has buggy libsupc++, so we should link with libstdc++ to avoid one
ifeq ($(CXX_VERSION_MINOR),0)
NOT_USE_NOSTDLIB := 1
endif
@@ -40,7 +40,10 @@
ifeq ($(CXX_VERSION_MINOR),2)
NOT_USE_NOSTDLIB := 1
endif
+ifeq ($(CXX_VERSION_MINOR),3)
+NOT_USE_NOSTDLIB := 1
endif
+endif
endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-08-17 11:16:45
|
Revision: 1687
http://complement.svn.sourceforge.net/complement/?rev=1687&view=rev
Author: complement
Date: 2007-08-17 04:16:43 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
use ${CXXFLAGS} when detect position of files and libraries; this useful for
multilib gcc configuration, when something like -m32 select libraries family.
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
trunk/complement/explore/Makefiles/gmake/app/gcc.mak
trunk/complement/explore/Makefiles/gmake/lib/gcc.mak
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2007-08-17 07:42:35 UTC (rev 1686)
+++ trunk/complement/explore/Makefiles/ChangeLog 2007-08-17 11:16:43 UTC (rev 1687)
@@ -1,3 +1,10 @@
+2007-08-17 Petr Ovtchenkov <pt...@is...>
+
+ * gmake/app/gcc.mak, gmake/lib/gcc.mak: use ${CXXFLAGS} when
+ detect position of files and libraries; this useful for
+ multilib gcc configuration, when something like -m32 select
+ libraries family.
+
2007-08-08 Petr Ovtchenkov <pt...@is...>
* gmake/app/rules.mak: use special link string for Digital Mars
Modified: trunk/complement/explore/Makefiles/gmake/app/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/gcc.mak 2007-08-17 07:42:35 UTC (rev 1686)
+++ trunk/complement/explore/Makefiles/gmake/app/gcc.mak 2007-08-17 11:16:43 UTC (rev 1687)
@@ -83,7 +83,7 @@
ifdef _USE_NOSTDLIB
# Check whether gcc builded with --disable-shared
-ifeq ($(shell ${CXX} -print-file-name=libgcc_eh.a),libgcc_eh.a)
+ifeq ($(shell ${CXX} ${CXXFLAGS} -print-file-name=libgcc_eh.a),libgcc_eh.a)
# gcc builded with --disable-shared, (no library libgcc_eh.a); all exception support in libgcc.a
_LGCC_EH :=
_LGCC_S := -lgcc
@@ -102,30 +102,30 @@
# ifeq ($(CXX_VERSION_MAJOR),3)
ifeq ($(OSNAME),linux)
-START_OBJ := $(shell for o in crt1.o crti.o crtbegin.o; do ${CXX} -print-file-name=$$o; done)
-END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} -print-file-name=$$o; done)
+START_OBJ := $(shell for o in crt1.o crti.o crtbegin.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
+END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm
endif
ifeq ($(OSNAME),openbsd)
-START_OBJ := $(shell for o in crt0.o crtbegin.o; do ${CXX} -print-file-name=$$o; done)
-END_OBJ := $(shell for o in crtend.o; do ${CXX} -print-file-name=$$o; done)
+START_OBJ := $(shell for o in crt0.o crtbegin.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
+END_OBJ := $(shell for o in crtend.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm
endif
ifeq ($(OSNAME),freebsd)
# FreeBSD < 5.3 should use -lc_r, while FreeBSD >= 5.3 use -lpthread
PTHR := $(shell if [ ${OSREL_MAJOR} -gt 5 ] ; then echo "pthread" ; else if [ ${OSREL_MAJOR} -lt 5 ] ; then echo "c_r" ; else if [ ${OSREL_MINOR} -lt 3 ] ; then echo "c_r" ; else echo "pthread"; fi ; fi ; fi)
-START_OBJ := $(shell for o in crt1.o crti.o crtbegin.o; do ${CXX} -print-file-name=$$o; done)
-END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} -print-file-name=$$o; done)
+START_OBJ := $(shell for o in crt1.o crti.o crtbegin.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
+END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -l${PTHR} -lc -lm
endif
ifeq ($(OSNAME),netbsd)
-START_OBJ := $(shell for o in crt1.o crti.o crtbegin.o; do ${CXX} -print-file-name=$$o; done)
-END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} -print-file-name=$$o; done)
+START_OBJ := $(shell for o in crt1.o crti.o crtbegin.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
+END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm
endif
ifeq ($(OSNAME),sunos)
-START_OBJ := $(shell for o in crt1.o crti.o crtbegin.o; do ${CXX} -print-file-name=$$o; done)
-END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} -print-file-name=$$o; done)
+START_OBJ := $(shell for o in crt1.o crti.o crtbegin.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
+END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm
endif
ifeq ($(OSNAME),darwin)
Modified: trunk/complement/explore/Makefiles/gmake/lib/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/gcc.mak 2007-08-17 07:42:35 UTC (rev 1686)
+++ trunk/complement/explore/Makefiles/gmake/lib/gcc.mak 2007-08-17 11:16:43 UTC (rev 1687)
@@ -93,7 +93,7 @@
NOSTDLIB :=
# Check whether gcc builded with --disable-shared
-ifeq ($(shell ${CXX} -print-file-name=libgcc_eh.a),libgcc_eh.a)
+ifeq ($(shell ${CXX} ${CXXFLAGS} -print-file-name=libgcc_eh.a),libgcc_eh.a)
# gcc builded with --disable-shared, (no library libgcc_eh.a); all exception support in libgcc.a
_LGCC_EH :=
_LGCC_S := -lgcc
@@ -114,31 +114,31 @@
# Include whole language support archive (libsupc++.a) into libstlport:
# all C++ issues are in libstlport now.
ifeq ($(OSNAME),linux)
-START_OBJ := $(shell for o in crti.o crtbeginS.o; do ${CXX} -print-file-name=$$o; done)
+START_OBJ := $(shell for o in crti.o crtbeginS.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
#START_A_OBJ := $(shell for o in crti.o crtbeginT.o; do ${CXX} -print-file-name=$$o; done)
-END_OBJ := $(shell for o in crtendS.o crtn.o; do ${CXX} -print-file-name=$$o; done)
+END_OBJ := $(shell for o in crtendS.o crtn.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm
endif
ifeq ($(OSNAME),openbsd)
-START_OBJ := $(shell for o in crtbeginS.o; do ${CXX} -print-file-name=$$o; done)
-END_OBJ := $(shell for o in crtendS.o; do ${CXX} -print-file-name=$$o; done)
+START_OBJ := $(shell for o in crtbeginS.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
+END_OBJ := $(shell for o in crtendS.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm
endif
ifeq ($(OSNAME),freebsd)
# FreeBSD < 5.3 should use -lc_r, while FreeBSD >= 5.3 use -lpthread
PTHR := $(shell if [ ${OSREL_MAJOR} -gt 5 ] ; then echo "pthread" ; else if [ ${OSREL_MAJOR} -lt 5 ] ; then echo "c_r" ; else if [ ${OSREL_MINOR} -lt 3 ] ; then echo "c_r" ; else echo "pthread"; fi ; fi ; fi)
-START_OBJ := $(shell for o in crti.o crtbeginS.o; do ${CXX} -print-file-name=$$o; done)
-END_OBJ := $(shell for o in crtendS.o crtn.o; do ${CXX} -print-file-name=$$o; done)
+START_OBJ := $(shell for o in crti.o crtbeginS.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
+END_OBJ := $(shell for o in crtendS.o crtn.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
STDLIBS := ${STLPORT_LIB} ${_LGCC_S} -l${PTHR} -lc -lm
endif
ifeq ($(OSNAME),netbsd)
-START_OBJ := $(shell for o in crti.o crtbeginS.o; do ${CXX} -print-file-name=$$o; done)
-END_OBJ := $(shell for o in crtendS.o crtn.o; do ${CXX} -print-file-name=$$o; done)
+START_OBJ := $(shell for o in crti.o crtbeginS.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
+END_OBJ := $(shell for o in crtendS.o crtn.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm
endif
ifeq ($(OSNAME),sunos)
-START_OBJ := $(shell for o in crti.o crtbegin.o; do ${CXX} -print-file-name=$$o; done)
-END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} -print-file-name=$$o; done)
+START_OBJ := $(shell for o in crti.o crtbegin.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
+END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
STDLIBS := ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm -lrt
endif
ifeq ($(OSNAME),darwin)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-08-30 14:35:49
|
Revision: 1715
http://complement.svn.sourceforge.net/complement/?rev=1715&view=rev
Author: complement
Date: 2007-08-30 07:35:47 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
$(AUX_DIR) for things like archive repack
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
trunk/complement/explore/Makefiles/gmake/lib/clean.mak
trunk/complement/explore/Makefiles/gmake/targetdirs.mak
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2007-08-30 14:34:12 UTC (rev 1714)
+++ trunk/complement/explore/Makefiles/ChangeLog 2007-08-30 14:35:47 UTC (rev 1715)
@@ -1,3 +1,13 @@
+2007-08-30 Petr Ovtchenkov <pt...@is...>
+
+ * gmake/sysid.mak, gmake/app/gcc.mak, gmake/lib/gcc.mak:
+ MacOS X 10.4 with gcc;
+
+ * gmake/gcc.mak: use STLport's experience for MinGW;
+
+ * gmake/targetdirs.mak, gmake/lib/clean.mak: $(AUX_DIR) for things
+ like archive repack;
+
2007-08-29 Petr Ovtchenkov <pt...@is...>
* gmake/targetdirs.mak: default installation path is /usr/local
Modified: trunk/complement/explore/Makefiles/gmake/lib/clean.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/clean.mak 2007-08-30 14:34:12 UTC (rev 1714)
+++ trunk/complement/explore/Makefiles/gmake/lib/clean.mak 2007-08-30 14:35:47 UTC (rev 1715)
@@ -1,6 +1,6 @@
# -*- makefile -*- Time-stamp: <07/05/30 23:55:47 ptr>
#
-# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
# Petr Ovtchenkov
#
# Portion Copyright (c) 1999-2001
@@ -85,7 +85,7 @@
distclean::
@-rm -f $(DEPENDS_COLLECTION)
- @-rmdir -p ${OUTPUT_DIR} ${OUTPUT_DIR_DBG} ${OUTPUT_DIR_STLDBG} 2>/dev/null
+ @-rmdir -p $(AUX_DIR) ${OUTPUT_DIR} ${OUTPUT_DIR_DBG} ${OUTPUT_DIR_STLDBG} 2>/dev/null
uninstall::
ifdef LIBNAME
Modified: trunk/complement/explore/Makefiles/gmake/targetdirs.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/targetdirs.mak 2007-08-30 14:34:12 UTC (rev 1714)
+++ trunk/complement/explore/Makefiles/gmake/targetdirs.mak 2007-08-30 14:35:47 UTC (rev 1715)
@@ -1,6 +1,6 @@
# Time-stamp: <06/11/03 18:47:05 ptr>
#
-# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
# Petr Ovtchenkov
#
# Portion Copyright (c) 1999-2001
@@ -26,6 +26,9 @@
# file to store generated dependencies for make:
DEPENDS_COLLECTION := $(PRE_OUTPUT_DIR)/.make.depend
+# catalog for auxilary files, if any
+AUX_DIR := $(PRE_OUTPUT_DIR)/.auxdir
+
# I use the same catalog, as for shared:
OUTPUT_DIR_A := $(OUTPUT_DIR)
OUTPUT_DIR_A_DBG := $(OUTPUT_DIR_DBG)
@@ -74,7 +77,7 @@
INSTALL_BIN_DIRS := $(sort $(INSTALL_BIN_DIRS))
INSTALL_DIRS := $(sort $(INSTALL_LIB_DIRS) $(INSTALL_BIN_DIRS))
-PHONY += $(OUTPUT_DIRS) $(INSTALL_DIRS)
+PHONY += $(OUTPUT_DIRS) $(INSTALL_DIRS) $(AUX_DIR)
define createdirs
@for d in $@ ; do \
@@ -93,3 +96,5 @@
$(INSTALL_DIRS):
$(createdirs)
+$(AUX_DIR):
+ $(createdirs)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-11-13 13:17:46
|
Revision: 1786
http://complement.svn.sourceforge.net/complement/?rev=1786&view=rev
Author: complement
Date: 2007-11-13 05:17:44 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
add macro LIBPREFIX to allow build shared object with name satisfied to plug-in
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
trunk/complement/explore/Makefiles/gmake/unix/lib.mak
Added Paths:
-----------
trunk/complement/explore/Makefiles/ut/somodule/
trunk/complement/explore/Makefiles/ut/somodule/Makefile
trunk/complement/explore/Makefiles/ut/somodule/Makefile.inc
trunk/complement/explore/Makefiles/ut/somodule/test_c.cc
trunk/complement/explore/Makefiles/ut/somodule/test_cc.cc
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2007-10-31 18:36:41 UTC (rev 1785)
+++ trunk/complement/explore/Makefiles/ChangeLog 2007-11-13 13:17:44 UTC (rev 1786)
@@ -1,3 +1,10 @@
+2007-11-13 Petr Ovtchenkov <pt...@is...>
+
+ * gmake/unix/lib.mak: add macro LIBPREFIX to allow build shared
+ objects with names satisfied plug-in customs;
+
+ * ut/somodule: test for feature above.
+
2007-08-30 Petr Ovtchenkov <pt...@is...>
* gmake/sysid.mak, gmake/app/gcc.mak, gmake/lib/gcc.mak:
Modified: trunk/complement/explore/Makefiles/gmake/unix/lib.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/unix/lib.mak 2007-10-31 18:36:41 UTC (rev 1785)
+++ trunk/complement/explore/Makefiles/gmake/unix/lib.mak 2007-11-13 13:17:44 UTC (rev 1786)
@@ -1,6 +1,6 @@
# -*- makefile -*- Time-stamp: <06/11/02 10:37:02 ptr>
#
-# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
# Petr Ovtchenkov
#
# Portion Copyright (c) 1999-2001
@@ -11,10 +11,11 @@
DBG_SUFFIX ?= g
STLDBG_SUFFIX ?= stl${DBG_SUFFIX}
+LIBPREFIX ?= lib
# Shared libraries:
-SO_NAME := lib${LIBNAME}.$(SO)
+SO_NAME := ${LIBPREFIX}${LIBNAME}.$(SO)
SO_NAMEx := ${SO_NAME}.${MAJOR}
SO_NAMExx := ${SO_NAMEx}.${MINOR}
SO_NAMExxx := ${SO_NAMExx}.${PATCH}
@@ -24,7 +25,7 @@
SO_NAME_OUTxx := $(OUTPUT_DIR)/${SO_NAMExx}
SO_NAME_OUTxxx := $(OUTPUT_DIR)/${SO_NAMExxx}
-SO_NAME_DBG := lib${LIBNAME}${DBG_SUFFIX}.$(SO)
+SO_NAME_DBG := ${LIBPREFIX}${LIBNAME}${DBG_SUFFIX}.$(SO)
SO_NAME_DBGx := ${SO_NAME_DBG}.${MAJOR}
SO_NAME_DBGxx := ${SO_NAME_DBGx}.${MINOR}
SO_NAME_DBGxxx := ${SO_NAME_DBGxx}.${PATCH}
@@ -35,7 +36,7 @@
SO_NAME_OUT_DBGxxx := $(OUTPUT_DIR_DBG)/${SO_NAME_DBGxxx}
ifndef WITHOUT_STLPORT
-SO_NAME_STLDBG := lib${LIBNAME}${STLDBG_SUFFIX}.$(SO)
+SO_NAME_STLDBG := ${LIBPREFIX}${LIBNAME}${STLDBG_SUFFIX}.$(SO)
SO_NAME_STLDBGx := ${SO_NAME_STLDBG}.${MAJOR}
SO_NAME_STLDBGxx := ${SO_NAME_STLDBGx}.${MINOR}
SO_NAME_STLDBGxxx := ${SO_NAME_STLDBGxx}.${PATCH}
@@ -49,13 +50,13 @@
# Static libraries:
-A_NAME := lib${LIBNAME}.$(ARCH)
+A_NAME := ${LIBPREFIX}${LIBNAME}.$(ARCH)
A_NAME_OUT := $(OUTPUT_DIR_A)/$(A_NAME)
-A_NAME_DBG := lib${LIBNAME}${DBG_SUFFIX}.$(ARCH)
+A_NAME_DBG := ${LIBPREFIX}${LIBNAME}${DBG_SUFFIX}.$(ARCH)
A_NAME_OUT_DBG := $(OUTPUT_DIR_A_DBG)/$(A_NAME_DBG)
ifndef WITHOUT_STLPORT
-A_NAME_STLDBG := lib${LIBNAME}${STLDBG_SUFFIX}.$(ARCH)
+A_NAME_STLDBG := ${LIBPREFIX}${LIBNAME}${STLDBG_SUFFIX}.$(ARCH)
A_NAME_OUT_STLDBG := $(OUTPUT_DIR_A_STLDBG)/$(A_NAME_STLDBG)
endif
Property changes on: trunk/complement/explore/Makefiles/ut/somodule
___________________________________________________________________
Name: svn:ignore
+ obj
Added: trunk/complement/explore/Makefiles/ut/somodule/Makefile
===================================================================
--- trunk/complement/explore/Makefiles/ut/somodule/Makefile (rev 0)
+++ trunk/complement/explore/Makefiles/ut/somodule/Makefile 2007-11-13 13:17:44 UTC (rev 1786)
@@ -0,0 +1,18 @@
+# -*- Makefile -*- Time-stamp: <06/11/10 16:23:01 ptr>
+
+SRCROOT := ../../..
+EXTRA_POST := checks
+
+include Makefile.inc
+include ${SRCROOT}/Makefiles/gmake/top.mak
+
+INCLUDES += -I./include
+
+checks:
+ file ${SO_NAME_OUTxxx} | grep ELF >/dev/null || exit 1
+ file ${SO_NAME_OUTxx} | grep link >/dev/null || exit 1
+ file ${SO_NAME_OUTx} | grep link >/dev/null || exit 1
+ file ${SO_NAME_OUT} | grep link >/dev/null || exit 1
+
+PHONY += checks
+
Added: trunk/complement/explore/Makefiles/ut/somodule/Makefile.inc
===================================================================
--- trunk/complement/explore/Makefiles/ut/somodule/Makefile.inc (rev 0)
+++ trunk/complement/explore/Makefiles/ut/somodule/Makefile.inc 2007-11-13 13:17:44 UTC (rev 1786)
@@ -0,0 +1,9 @@
+# -*- Makefile -*- Time-stamp: <06/11/29 01:59:50 ptr>
+
+LIBPREFIX :=
+LIBNAME = test
+MAJOR = 0
+MINOR = 1
+PATCH = 2
+SRC_CC = test_cc.cc
+SRC_C = test_c.c
Added: trunk/complement/explore/Makefiles/ut/somodule/test_c.cc
===================================================================
--- trunk/complement/explore/Makefiles/ut/somodule/test_c.cc (rev 0)
+++ trunk/complement/explore/Makefiles/ut/somodule/test_c.cc 2007-11-13 13:17:44 UTC (rev 1786)
@@ -0,0 +1,4 @@
+int g()
+{
+ return 0;
+}
Added: trunk/complement/explore/Makefiles/ut/somodule/test_cc.cc
===================================================================
--- trunk/complement/explore/Makefiles/ut/somodule/test_cc.cc (rev 0)
+++ trunk/complement/explore/Makefiles/ut/somodule/test_cc.cc 2007-11-13 13:17:44 UTC (rev 1786)
@@ -0,0 +1,4 @@
+int f()
+{
+ return 0;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-12-11 23:05:05
|
Revision: 1797
http://complement.svn.sourceforge.net/complement/?rev=1797&view=rev
Author: complement
Date: 2007-12-11 15:02:38 -0800 (Tue, 11 Dec 2007)
Log Message:
-----------
install-headers usable; it use user-defined macro HEADERS_BASE
[catalog and all files, keeping directory structure] and HEADERS
[for single files]; target catalog is INSTALL_HDR_DIR, by default
it ${BASE_INSTALL_DIR}/include
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
trunk/complement/explore/Makefiles/gmake/unix/rules-install-so.mak
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2007-12-06 15:45:37 UTC (rev 1796)
+++ trunk/complement/explore/Makefiles/ChangeLog 2007-12-11 23:02:38 UTC (rev 1797)
@@ -1,3 +1,10 @@
+2007-12-12 Petr Ovtchenkov <pt...@is...>
+
+ * gmake/unix/rules-install-so.mak: install-headers usable; it use
+ user-defined macro HEADERS_BASE [catalog and all files, keeping
+ directory structure] and HEADERS [for single files]; target catalog
+ is INSTALL_HDR_DIR, by default it ${BASE_INSTALL_DIR}/include.
+
2007-11-13 Petr Ovtchenkov <pt...@is...>
* gmake/unix/lib.mak: add macro LIBPREFIX to allow build shared
Modified: trunk/complement/explore/Makefiles/gmake/unix/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/unix/rules-install-so.mak 2007-12-06 15:45:37 UTC (rev 1796)
+++ trunk/complement/explore/Makefiles/gmake/unix/rules-install-so.mak 2007-12-11 23:02:38 UTC (rev 1797)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <07/02/07 14:58:53 ptr>
+# -*- makefile -*- Time-stamp: <07/12/12 01:51:37 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
# Petr Ovtchenkov
@@ -140,31 +140,33 @@
${POST_INSTALL_STLDBG}
endif
+
define do_install_headers
if [ ! -d $(INSTALL_HDR_DIR) ]; then \
- echo $(INSTALL_D) $(INSTALL_HDR_DIR); \
+ $(INSTALL_D) $(INSTALL_HDR_DIR) || { echo "Can't create $(INSTALL_HDR_DIR)"; exit 1; }; \
fi; \
for dd in $(HEADERS_BASE); do \
d=`dirname $$dd`; \
h=`basename $$dd`; \
- f=`cd $$d; find $$h \( -type d \( -wholename "*/.svn" -o -prune \) \) -print`; \
+ f=`cd $$d; find $$h \( -wholename "*/.svn" -prune \) -o \( -type d -print \)`; \
for ddd in $$f; do \
if [ ! -d $(INSTALL_HDR_DIR)/$$ddd ]; then \
- echo $(INSTALL_D) $(INSTALL_HDR_DIR)/$$ddd; \
+ $(INSTALL_D) $(INSTALL_HDR_DIR)/$$ddd || { echo "Can't create $(INSTALL_HDR_DIR)/$$ddd"; exit 1; }; \
fi; \
done; \
- f=`find $$dd \( -type f \( \! \( -wholename "*/.svn/*" -o -name "*~" -o -name "*.bak" \) \) \) -print`; \
+ f=`find $$dd \( -wholename "*/.svn*" -o -name "*~" -o -name "*.bak" \) -prune -o \( -type f -print \)`; \
for ff in $$f; do \
h=`echo $$ff | sed -e "s|$$d|$(INSTALL_HDR_DIR)|"`; \
- echo $(INSTALL_F) $$ff $$h; \
+ $(INSTALL_F) $$ff $$h; \
done; \
done; \
for f in $(HEADERS); do \
h=`basename $$f`; \
- echo $(INSTALL_F) $$f $(INSTALL_HDR_DIR)/$$h; \
+ $(INSTALL_F) $$f $(INSTALL_HDR_DIR)/$$h || { echo "Can't install $(INSTALL_HDR_DIR)/$$h"; exit 1; }; \
done
endef
+# find $$dd \( -type f \( \! \( -wholename "*/.svn*" -o -name "*~" -o -name "*.bak" \) \) \) -print
# _HEADERS_FROM = $(shell for dd in $(HEADERS_BASE); do find $$dd \( -type f \( \! \( -wholename "*/.svn/*" -o -name "*~" -o -name "*.bak" \) \) \) -print ; done )
# _HEADERS_TO = $(foreach d,$(HEADERS_BASE),$(patsubst $(d)/%,$(BASE_INSTALL_DIR)include/%,$(_HEADERS_FROM)))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-12-21 16:58:39
|
Revision: 1800
http://complement.svn.sourceforge.net/complement/?rev=1800&view=rev
Author: complement
Date: 2007-12-21 08:58:36 -0800 (Fri, 21 Dec 2007)
Log Message:
-----------
allow strip application after install with tags install-strip and install-stripe-shared;
use option for strip for install-strip-shared too.
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
trunk/complement/explore/Makefiles/gmake/app/rules-install.mak
trunk/complement/explore/Makefiles/gmake/linux/sys.mak
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2007-12-17 15:13:51 UTC (rev 1799)
+++ trunk/complement/explore/Makefiles/ChangeLog 2007-12-21 16:58:36 UTC (rev 1800)
@@ -1,3 +1,10 @@
+2007-12-21 Petr Ovtchenkov <pt...@is...>
+
+ * gmake/app/rules-install.mak: allow strip application after install
+ with tags install-strip and install-stripe-shared;
+
+ * gmake/linux/sys.mak: use option for strip for install-strip-shared too.
+
2007-12-12 Petr Ovtchenkov <pt...@is...>
* gmake/unix/rules-install-so.mak: install-headers usable; it use
Modified: trunk/complement/explore/Makefiles/gmake/app/rules-install.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/rules-install.mak 2007-12-17 15:13:51 UTC (rev 1799)
+++ trunk/complement/explore/Makefiles/gmake/app/rules-install.mak 2007-12-21 16:58:36 UTC (rev 1800)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <06/12/12 09:37:04 ptr>
+# -*- makefile -*- Time-stamp: <07/12/21 18:39:57 yeti>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -33,6 +33,14 @@
endif
endef
+define prog_strip_install
+${STRIP} ${_INSTALL_STRIP_OPTION} $$(INSTALL_BIN_DIR)/$${INSTALL_$(1)_PRGNAME};
+endef
+
+ifndef INSTALL_STRIP_TAGS
+INSTALL_STRIP_TAGS := install-strip-shared
+endif
+
INSTALL_PRGNAME := ${PRGNAME}${EXE}
$(foreach prg,$(PRGNAMES),$(eval $(call prog_install,$(prg))))
@@ -49,6 +57,17 @@
$(INSTALL_PRGNAME_CMD)
$(POST_INSTALL)
+install-strip: ${INSTALL_STRIP_TAGS} $(INSTALL_BIN_DIR)
+
+install-strip-shared: release-shared $(INSTALL_BIN_DIR)
+ifdef PRGNAME
+ $(INSTALL_EXE) ${PRG} $(INSTALL_BIN_DIR)/${INSTALL_PRGNAME}
+ ${STRIP} ${_INSTALL_STRIP_OPTION} $(INSTALL_BIN_DIR)/${INSTALL_PRGNAME}
+endif
+ $(INSTALL_PRGNAME_CMD)
+ $(foreach prg,$(PRGNAMES),$(eval $(call prog_strip_install,$(prg))))
+ $(POST_INSTALL)
+
install-dbg-shared: dbg-shared $(INSTALL_BIN_DIR_DBG)
ifdef PRGNAME
$(INSTALL_EXE) ${PRG_DBG} $(INSTALL_BIN_DIR_DBG)/${INSTALL_PRGNAME_DBG}
@@ -64,3 +83,5 @@
$(INSTALL_PRGNAME_CMD_STLDBG)
$(POST_INSTALL_STLDBG)
endif
+
+PHONY += install-strip install-strip-shared
\ No newline at end of file
Modified: trunk/complement/explore/Makefiles/gmake/linux/sys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/sys.mak 2007-12-17 15:13:51 UTC (rev 1799)
+++ trunk/complement/explore/Makefiles/gmake/linux/sys.mak 2007-12-21 16:58:36 UTC (rev 1800)
@@ -1,4 +1,4 @@
-# Time-stamp: <06/11/10 23:43:27 ptr>
+# Time-stamp: <07/12/21 18:40:54 yeti>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
# Petr Ovtchenkov
@@ -17,6 +17,10 @@
install-strip: _SO_STRIP_OPTION = -S
+install-strip-shared: _INSTALL_STRIP_OPTION = -s
+
+install-strip-shared: _SO_STRIP_OPTION = -S
+
INSTALL_SO := ${INSTALL} -c -m 0755 ${_INSTALL_STRIP_OPTION}
INSTALL_A := ${INSTALL} -c -m 0644
INSTALL_EXE := ${INSTALL} -c -m 0755
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2008-01-09 12:08:34
|
Revision: 1801
http://complement.svn.sourceforge.net/complement/?rev=1801&view=rev
Author: complement
Date: 2008-01-09 04:05:22 -0800 (Wed, 09 Jan 2008)
Log Message:
-----------
base rules for LaTeX and XFig documentation
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
Added Paths:
-----------
trunk/complement/explore/Makefiles/gmake/topdoc.mak
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2007-12-21 16:58:36 UTC (rev 1800)
+++ trunk/complement/explore/Makefiles/ChangeLog 2008-01-09 12:05:22 UTC (rev 1801)
@@ -1,3 +1,7 @@
+2008-01-08 Petr Ovtchenkov <pt...@is...>
+
+ * gmake/topdoc.mak: base rules for LaTeX and XFig documentation.
+
2007-12-21 Petr Ovtchenkov <pt...@is...>
* gmake/app/rules-install.mak: allow strip application after install
Added: trunk/complement/explore/Makefiles/gmake/topdoc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/topdoc.mak (rev 0)
+++ trunk/complement/explore/Makefiles/gmake/topdoc.mak 2008-01-09 12:05:22 UTC (rev 1801)
@@ -0,0 +1,109 @@
+# Time-stamp: <08/01/08 15:22:06 ptr>
+#
+# Copyright (c) 2007,2008
+# Petr Ovtchenkov
+#
+# Licensed under the Academic Free License version 3.0
+#
+
+.SUFFIXES:
+.SCCS_GET:
+.RCS_GET:
+
+PHONY ?=
+
+RULESBASE ?= $(SRCROOT)/Makefiles
+
+all: $(addsuffix .pdf,$(PDFNAMES))
+
+distclean:
+ if [ -f .gitignore ]; then rm -f `cat .gitignore`; fi
+ rm -rf .out
+
+PHONY += distclean
+
+OUTPUT_DIR = .out
+
+BASE_OUTPUT_DIR := .out
+PRE_OUTPUT_DIR := $(BASE_OUTPUT_DIR)
+OUTPUT_DIR := $(PRE_OUTPUT_DIR)$(EXTRA_DIRS)
+# catalog for auxilary files, if any
+AUX_DIR := $(PRE_OUTPUT_DIR)/.auxdir
+
+OUTPUT_DIRS := $(OUTPUT_DIR)
+# sort will remove duplicates:
+OUTPUT_DIRS := $(sort $(OUTPUT_DIRS))
+
+define createdirs
+@for d in $@ ; do \
+ if [ -e $$d -a -f $$d ] ; then \
+ echo "ERROR: Regular file $$d present, directory instead expected" ; \
+ exit 1; \
+ elif [ ! -d $$d ] ; then \
+ mkdir -p $$d ; \
+ fi ; \
+done
+endef
+
+$(OUTPUT_DIRS):
+ $(createdirs)
+
+$(AUX_DIR):
+ $(createdirs)
+
+PHONY += $(OUTPUT_DIRS) $(AUX_DIR)
+
+ALLFIG =
+
+define dep_mp
+$(1)_MPS := $(patsubst %.fig,%.mps,$(notdir ${$(1)_SRC_FIG}))
+ALLFIG += ${$(1)_SRC_FIG}
+endef
+
+$(foreach fig,$(PDFNAMES),$(eval $(call dep_mp,$(fig))))
+
+define pdf_
+$(1).pdf: $($(1)_SRC_TEX) $($(1)_MPS) $($(1)_EXTRA)
+ pdflatex $$<
+endef
+
+define rule_mp
+TMP1 := $$(OUTPUT_DIR)/$$(basename $$(notdir $(1))).mp
+$$(TMP1): $(OUTPUT_DIRS) $(1)
+ fig2dev -L mp $(1) $$@
+
+TMP2 := $$(OUTPUT_DIR)/$$(basename $$(notdir $(1))).0
+$$(TMP2): $$(TMP1)
+ (cd $${OUTPUT_DIR}; mpost `basename $$<`)
+
+TMP1 := $$(basename $$(notdir $(1))).mps
+$$(TMP1): $$(TMP2)
+ ln -sf $$< $$@
+endef
+
+define dep_mps
+#TMP1 := $$(basename $$(notdir $(1))).mps
+#$(2) := $($(2)) $${TMP1}
+#ALLMP := $$(ALLMP) $(1)
+endef
+
+#define rule_mps
+#TMP2 := $$(OUTPUT_DIR)/$$(basename $$(notdir $(1))).0
+#$$(TMP2): $(1)
+# $$(chdirs)
+# sed -i -e 's/beginfig(.)/beginfig(0)/' $$<
+# (cd $${OUTPUT_DIR}; mpost --tex=latex ../`basename $$<`)
+# rm -f $(1).mpx
+#
+#TMP1 := $$(basename $$(notdir $(1))).mps
+#$$(TMP1): $$(TMP2)
+# ln -sf $$< $$@
+#endef
+
+$(foreach pdf,$(PDFNAMES),$(eval $(call pdf_,$(pdf))))
+ALLFIG := $(sort $(ALLFIG))
+# ALLMP := $(sort $(ALLMP))
+$(foreach fig,$(ALLFIG),$(eval $(call rule_mp,$(fig))))
+# $(foreach mp,$(ALLMP),$(eval $(call rule_mps,$(mp))))
+
+.PHONY: ${PHONY}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2008-01-11 13:44:51
|
Revision: 1802
http://complement.svn.sourceforge.net/complement/?rev=1802&view=rev
Author: complement
Date: 2008-01-11 05:41:47 -0800 (Fri, 11 Jan 2008)
Log Message:
-----------
fix _FORCE_CXX macro reference
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
trunk/complement/explore/Makefiles/gmake/CC.mak
trunk/complement/explore/Makefiles/gmake/aCC.mak
trunk/complement/explore/Makefiles/gmake/gcc.mak
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2008-01-09 12:05:22 UTC (rev 1801)
+++ trunk/complement/explore/Makefiles/ChangeLog 2008-01-11 13:41:47 UTC (rev 1802)
@@ -1,3 +1,8 @@
+2008-01-11 Petr Ovtchenkov <pt...@is...>
+
+ * gmake/gcc.mak, gmake/CC.mak, gmake/aCC.mak: fix _FORCE_CXX macro
+ reference.
+
2008-01-08 Petr Ovtchenkov <pt...@is...>
* gmake/topdoc.mak: base rules for LaTeX and XFig documentation.
Modified: trunk/complement/explore/Makefiles/gmake/CC.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/CC.mak 2008-01-09 12:05:22 UTC (rev 1801)
+++ trunk/complement/explore/Makefiles/gmake/CC.mak 2008-01-11 13:41:47 UTC (rev 1802)
@@ -1,6 +1,6 @@
# Time-stamp: <06/11/10 15:57:24 ptr>
#
-# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2008
# Petr Ovtchenkov
#
# Portion Copyright (c) 1999-2001
@@ -14,13 +14,13 @@
ifndef _FORCE_CXX
CXX := CC
else
-CXX := $_FORCE_CXX
+CXX := ${_FORCE_CXX}
endif
ifndef _FORCE_CC
CC := cc
else
-CC := $_FORCE_CC
+CC := ${_FORCE_CC}
endif
CXX_VERSION := $(shell ${CXX} -V 2>&1 | grep ${CXX} | awk '{ print $$4; }')
Modified: trunk/complement/explore/Makefiles/gmake/aCC.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/aCC.mak 2008-01-09 12:05:22 UTC (rev 1801)
+++ trunk/complement/explore/Makefiles/gmake/aCC.mak 2008-01-11 13:41:47 UTC (rev 1802)
@@ -1,6 +1,6 @@
# Time-stamp: <07/05/31 01:07:37 ptr>
#
-# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2008
# Petr Ovtchenkov
#
# Portion Copyright (c) 1999-2001
@@ -12,13 +12,13 @@
ifndef _FORCE_CXX
CXX := aCC
else
-CXX := $_FORCE_CXX
+CXX := ${_FORCE_CXX}
endif
ifndef _FORCE_CC
CC := aCC
else
-CC := $_FORCE_CC
+CC := ${_FORCE_CC}
endif
CXX_VERSION := $(shell ${CXX} --version 2>&1 | grep ${CXX} | awk '{ print $$6; }')
Modified: trunk/complement/explore/Makefiles/gmake/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/gcc.mak 2008-01-09 12:05:22 UTC (rev 1801)
+++ trunk/complement/explore/Makefiles/gmake/gcc.mak 2008-01-11 13:41:47 UTC (rev 1802)
@@ -1,6 +1,6 @@
# Time-stamp: <07/07/12 10:51:42 ptr>
#
-# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2008
# Petr Ovtchenkov
#
# Portion Copyright (c) 1999-2001
@@ -12,13 +12,13 @@
ifndef _FORCE_CXX
CXX := c++
else
-CXX := $_FORCE_CXX
+CXX := ${_FORCE_CXX}
endif
ifndef _FORCE_CC
CC := gcc
else
-CC := $_FORCE_CC
+CC := ${_FORCE_CC}
endif
ifeq ($(OSNAME), windows)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2008-01-17 06:59:33
|
Revision: 1804
http://complement.svn.sourceforge.net/complement/?rev=1804&view=rev
Author: complement
Date: 2008-01-16 22:59:31 -0800 (Wed, 16 Jan 2008)
Log Message:
-----------
rules to generate mps from mp, that was made from gnuplot.
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
trunk/complement/explore/Makefiles/gmake/topdoc.mak
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2008-01-16 22:12:50 UTC (rev 1803)
+++ trunk/complement/explore/Makefiles/ChangeLog 2008-01-17 06:59:31 UTC (rev 1804)
@@ -1,3 +1,8 @@
+2008-01-17 Petr Ovtchenkov <pt...@is...>
+
+ * gmake/topdoc.mak: rules to generate mps from mp, that was made
+ from gnuplot.
+
2008-01-11 Petr Ovtchenkov <pt...@is...>
* gmake/gcc.mak, gmake/CC.mak, gmake/aCC.mak: fix _FORCE_CXX macro
Modified: trunk/complement/explore/Makefiles/gmake/topdoc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/topdoc.mak 2008-01-16 22:12:50 UTC (rev 1803)
+++ trunk/complement/explore/Makefiles/gmake/topdoc.mak 2008-01-17 06:59:31 UTC (rev 1804)
@@ -1,4 +1,4 @@
-# Time-stamp: <08/01/08 15:22:06 ptr>
+# Time-stamp: <08/01/17 09:39:54 ptr>
#
# Copyright (c) 2007,2008
# Petr Ovtchenkov
@@ -63,7 +63,7 @@
$(foreach fig,$(PDFNAMES),$(eval $(call dep_mp,$(fig))))
define pdf_
-$(1).pdf: $($(1)_SRC_TEX) $($(1)_MPS) $($(1)_EXTRA)
+$(1).pdf: $($(1)_SRC_TEX) $($(1)_MPS) $($(1)_MP_MPS) $($(1)_EXTRA)
pdflatex $$<
endef
@@ -82,28 +82,28 @@
endef
define dep_mps
-#TMP1 := $$(basename $$(notdir $(1))).mps
-#$(2) := $($(2)) $${TMP1}
-#ALLMP := $$(ALLMP) $(1)
+$(1)_MP_MPS := $(patsubst %.mp,%.mps,$(notdir ${$(1)_SRC_MP}))
+ALLMP += ${$(1)_SRC_MP}
endef
-#define rule_mps
-#TMP2 := $$(OUTPUT_DIR)/$$(basename $$(notdir $(1))).0
-#$$(TMP2): $(1)
-# $$(chdirs)
-# sed -i -e 's/beginfig(.)/beginfig(0)/' $$<
-# (cd $${OUTPUT_DIR}; mpost --tex=latex ../`basename $$<`)
-# rm -f $(1).mpx
-#
-#TMP1 := $$(basename $$(notdir $(1))).mps
-#$$(TMP1): $$(TMP2)
-# ln -sf $$< $$@
-#endef
+$(foreach mp,$(PDFNAMES),$(eval $(call dep_mps,$(mp))))
+define rule_mps
+TMP2 := $$(OUTPUT_DIR)/$$(basename $$(notdir $(1))).0
+$$(TMP2): $(1)
+ sed -i -e 's/beginfig(.)/beginfig(0)/' $$<
+ (cd $${OUTPUT_DIR}; mpost --tex=latex ../`basename $$<`)
+ rm -f $(1)x
+
+TMP1 := $$(basename $$(notdir $(1))).mps
+$$(TMP1): $$(TMP2)
+ ln -sf $$< $$@
+endef
+
$(foreach pdf,$(PDFNAMES),$(eval $(call pdf_,$(pdf))))
ALLFIG := $(sort $(ALLFIG))
-# ALLMP := $(sort $(ALLMP))
+ALLMP := $(sort $(ALLMP))
$(foreach fig,$(ALLFIG),$(eval $(call rule_mp,$(fig))))
-# $(foreach mp,$(ALLMP),$(eval $(call rule_mps,$(mp))))
+$(foreach mp,$(ALLMP),$(eval $(call rule_mps,$(mp))))
.PHONY: ${PHONY}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2008-02-26 10:55:20
|
Revision: 1815
http://complement.svn.sourceforge.net/complement/?rev=1815&view=rev
Author: complement
Date: 2008-02-26 02:55:11 -0800 (Tue, 26 Feb 2008)
Log Message:
-----------
use more convenient option -dumpversion to detect compiler's revision; check that -fuse-cxa-atexit really required; remove -fident option
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
trunk/complement/explore/Makefiles/gmake/gcc.mak
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2008-02-20 09:47:34 UTC (rev 1814)
+++ trunk/complement/explore/Makefiles/ChangeLog 2008-02-26 10:55:11 UTC (rev 1815)
@@ -1,3 +1,9 @@
+2008-02-26 Petr Ovtchenkov <pt...@is...>
+
+ * gmake/gcc.mak: use more convenient option -dumpversion
+ to detect compiler's revision; check that -fuse-cxa-atexit
+ really required; remove -fident option.
+
2008-01-17 Petr Ovtchenkov <pt...@is...>
* gmake/topdoc.mak: rules to generate mps from mp, that was made
Modified: trunk/complement/explore/Makefiles/gmake/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/gcc.mak 2008-02-20 09:47:34 UTC (rev 1814)
+++ trunk/complement/explore/Makefiles/gmake/gcc.mak 2008-02-26 10:55:11 UTC (rev 1815)
@@ -1,4 +1,4 @@
-# Time-stamp: <07/07/12 10:51:42 ptr>
+# Time-stamp: <08/02/26 13:46:36 yeti>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005-2008
# Petr Ovtchenkov
@@ -31,30 +31,22 @@
AS := ${TARGET_OS}-${AS}
endif
-ifeq ($(OSNAME), darwin)
CXX_VERSION := $(shell ${CXX} -dumpversion)
-# TODO: ensure PANTHER's gcc compatibility...
-CXX_VERSION_MAJOR := $(shell ${CXX} -dumpversion | awk 'BEGIN { FS = "."; } { print $1; }')
-CXX_VERSION_MINOR := $(shell ${CXX} -dumpversion | awk 'BEGIN { FS = "."; } { print $2; }')
-CXX_VERSION_PATCH := $(shell ${CXX} -dumpversion | awk 'BEGIN { FS = "."; } { print $3; }')
+CXX_VERSION_MAJOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$1; }')
+CXX_VERSION_MINOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$2; }')
+CXX_VERSION_PATCH := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$3; }')
+
+# Check that we need option -fuse-cxa-atexit for compiler
+_CXA_ATEXIT := $(shell ${CXX} -v 2>&1 | grep -q -e "--enable-__cxa_atexit" || echo "-fuse-cxa-atexit")
+
+ifeq ($(OSNAME), darwin)
# This is to differentiate Apple-builded compiler from original
-# compiler (it's has different behaviour)
+# GNU compiler (it's has different behaviour)
ifneq ("$(shell ${CXX} -v 2>&1 | grep Apple)", "")
GCC_APPLE_CC := 1
endif
-else
-CXX_VERSION := $(shell ${CXX} --version | grep GCC | awk '{ print $$3; }')
-
-ifeq ($(CXX_VERSION),)
-# 2.95 report only version
-CXX_VERSION := $(shell ${CXX} --version)
endif
-CXX_VERSION_MAJOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$1; }')
-CXX_VERSION_MINOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$2; }')
-CXX_VERSION_PATCH := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$3; }')
-endif
-
DEFS ?=
OPT ?=
@@ -78,7 +70,7 @@
dbg-shared : RCFLAGS += -DBUILD=g -DBUILD_INFOS=-g
stldbg-shared : RCFLAGS += -DBUILD=stlg -DBUILD_INFOS="-g -D_STLP_DEBUG"
RC_OUTPUT_OPTION = -o $@
-CXXFLAGS = -Wall -Wsign-promo -Wcast-qual -fexceptions -fident
+CXXFLAGS = -Wall -Wsign-promo -Wcast-qual -fexceptions
ifeq ($(OSREALNAME), mingw)
CCFLAGS += -mthreads
CFLAGS += -mthreads
@@ -104,30 +96,30 @@
ifeq ($(OSNAME),sunos)
CCFLAGS = -pthreads $(OPT)
CFLAGS = -pthreads $(OPT)
-# CXXFLAGS = -pthreads -nostdinc++ -fexceptions -fident $(OPT)
-CXXFLAGS = -pthreads -fexceptions -fident $(OPT)
+# CXXFLAGS = -pthreads -nostdinc++ -fexceptions $(OPT)
+CXXFLAGS = -pthreads -fexceptions $(OPT)
endif
ifeq ($(OSNAME),linux)
CCFLAGS = -pthread $(OPT)
CFLAGS = -pthread $(OPT)
-# CXXFLAGS = -pthread -nostdinc++ -fexceptions -fident $(OPT)
-CXXFLAGS = -pthread -fexceptions -fident $(OPT)
+# CXXFLAGS = -pthread -nostdinc++ -fexceptions $(OPT)
+CXXFLAGS = -pthread -fexceptions $(OPT)
endif
ifeq ($(OSNAME),openbsd)
CCFLAGS = -pthread $(OPT)
CFLAGS = -pthread $(OPT)
-# CXXFLAGS = -pthread -nostdinc++ -fexceptions -fident $(OPT)
-CXXFLAGS = -pthread -fexceptions -fident $(OPT)
+# CXXFLAGS = -pthread -nostdinc++ -fexceptions $(OPT)
+CXXFLAGS = -pthread -fexceptions $(OPT)
endif
ifeq ($(OSNAME),freebsd)
CCFLAGS = -pthread $(OPT)
CFLAGS = -pthread $(OPT)
DEFS += -D_REENTRANT
-# CXXFLAGS = -pthread -nostdinc++ -fexceptions -fident $(OPT)
-CXXFLAGS = -pthread -fexceptions -fident $(OPT)
+# CXXFLAGS = -pthread -nostdinc++ -fexceptions $(OPT)
+CXXFLAGS = -pthread -fexceptions $(OPT)
endif
ifeq ($(OSNAME),darwin)
@@ -143,8 +135,8 @@
ifeq ($(OSNAME),hp-ux)
CCFLAGS = -pthread $(OPT)
CFLAGS = -pthread $(OPT)
-# CXXFLAGS = -pthread -nostdinc++ -fexceptions -fident $(OPT)
-CXXFLAGS = -pthread -fexceptions -fident $(OPT)
+# CXXFLAGS = -pthread -nostdinc++ -fexceptions $(OPT)
+CXXFLAGS = -pthread -fexceptions $(OPT)
endif
#ifeq ($(CXX_VERSION_MAJOR),3)
@@ -165,7 +157,7 @@
# Required for correct order of static objects dtors calls:
ifeq ("$(findstring $(OSNAME),darwin windows)","")
ifneq ($(CXX_VERSION_MAJOR),2)
-CXXFLAGS += -fuse-cxa-atexit
+CXXFLAGS += $(_CXA_ATEXIT)
endif
endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2008-02-27 14:13:58
|
Revision: 1818
http://complement.svn.sourceforge.net/complement/?rev=1818&view=rev
Author: complement
Date: 2008-02-27 06:13:55 -0800 (Wed, 27 Feb 2008)
Log Message:
-----------
gmake/lib/gcc.mak: 3.3 is normal compiler, just some builds was
wrong---use common scheme for compiler's libraries;
gmake/gcc.mak: option for 64-bit HP-UX at IA64;
gmake/hp-ux/targetsys.mak: HP use .so for shared libs on intel-based 64-bits HP-UX;
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
trunk/complement/explore/Makefiles/gmake/gcc.mak
trunk/complement/explore/Makefiles/gmake/hp-ux/targetsys.mak
trunk/complement/explore/Makefiles/gmake/lib/gcc.mak
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2008-02-26 14:39:44 UTC (rev 1817)
+++ trunk/complement/explore/Makefiles/ChangeLog 2008-02-27 14:13:55 UTC (rev 1818)
@@ -1,3 +1,14 @@
+2008-02-27 Petr Ovtchenkov <pt...@is...>
+
+ * gmake/lib/gcc.mak: 3.3 is normal compiler, just some
+ builds was wrong---use common scheme for compiler's
+ libraries;
+
+ * gmake/gcc.mak: option for 64-bit HP-UX at IA64;
+
+ * gmake/hp-ux/targetsys.mak: HP use .so for shared libs
+ on intel-based 64-bits HP-UX;
+
2008-02-26 Petr Ovtchenkov <pt...@is...>
* gmake/gcc.mak: use more convenient option -dumpversion
Modified: trunk/complement/explore/Makefiles/gmake/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/gcc.mak 2008-02-26 14:39:44 UTC (rev 1817)
+++ trunk/complement/explore/Makefiles/gmake/gcc.mak 2008-02-27 14:13:55 UTC (rev 1818)
@@ -1,4 +1,4 @@
-# Time-stamp: <08/02/26 13:46:36 yeti>
+# Time-stamp: <08/02/26 13:46:36 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005-2008
# Petr Ovtchenkov
@@ -133,6 +133,10 @@
endif
ifeq ($(OSNAME),hp-ux)
+ifneq ($(M_ARCH),ia64)
+release-static : OPT += -fno-reorder-blocks
+release-shared : OPT += -fno-reorder-blocks
+endif
CCFLAGS = -pthread $(OPT)
CFLAGS = -pthread $(OPT)
# CXXFLAGS = -pthread -nostdinc++ -fexceptions $(OPT)
Modified: trunk/complement/explore/Makefiles/gmake/hp-ux/targetsys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/hp-ux/targetsys.mak 2008-02-26 14:39:44 UTC (rev 1817)
+++ trunk/complement/explore/Makefiles/gmake/hp-ux/targetsys.mak 2008-02-27 14:13:55 UTC (rev 1818)
@@ -1,4 +1,4 @@
-# Time-stamp: <07/05/31 00:48:27 ptr>
+# Time-stamp: <08/01/29 09:44:51 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
# Petr Ovtchenkov
@@ -9,7 +9,11 @@
# Licensed under the Academic Free License version 3.0
#
+ifeq ($(M_ARCH),ia64)
+SO := so
+else
SO := sl
+endif
ARCH := a
AR := ar
Modified: trunk/complement/explore/Makefiles/gmake/lib/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/gcc.mak 2008-02-26 14:39:44 UTC (rev 1817)
+++ trunk/complement/explore/Makefiles/gmake/lib/gcc.mak 2008-02-27 14:13:55 UTC (rev 1818)
@@ -30,7 +30,7 @@
endif
ifeq ($(CXX_VERSION_MAJOR),3)
-# gcc before 3.4 (i.e. 3.0.x, 3.1.x, 3.2.x) has buggy libsupc++, so we should link with libstdc++ to avoid one
+# gcc before 3.3 (i.e. 3.0.x, 3.1.x, 3.2.x) has buggy libsupc++, so we should link with libstdc++ to avoid one
ifeq ($(CXX_VERSION_MINOR),0)
NOT_USE_NOSTDLIB := 1
endif
@@ -40,10 +40,7 @@
ifeq ($(CXX_VERSION_MINOR),2)
NOT_USE_NOSTDLIB := 1
endif
-ifeq ($(CXX_VERSION_MINOR),3)
-NOT_USE_NOSTDLIB := 1
endif
-endif
endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2008-06-06 12:29:57
|
Revision: 1887
http://complement.svn.sourceforge.net/complement/?rev=1887&view=rev
Author: complement
Date: 2008-06-06 05:29:52 -0700 (Fri, 06 Jun 2008)
Log Message:
-----------
use $(DESTDIR) as in common practice (change root of installation,
but don't change run paths);
fix options for ctags/etags.
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
trunk/complement/explore/Makefiles/gmake/depend.mak
trunk/complement/explore/Makefiles/gmake/targetdirs.mak
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2008-06-05 08:57:35 UTC (rev 1886)
+++ trunk/complement/explore/Makefiles/ChangeLog 2008-06-06 12:29:52 UTC (rev 1887)
@@ -1,3 +1,10 @@
+2008-06-06 Petr Ovtchenkov <pt...@is...>
+
+ * gmake/targetdirs.mak: use $(DESTDIR) as in common practice
+ (change root of installation, but don't change run paths);
+
+ * gmake/depend.mak: fix options for ctags/etags.
+
2008-02-27 Petr Ovtchenkov <pt...@is...>
* gmake/lib/gcc.mak: 3.3 is normal compiler, just some
Modified: trunk/complement/explore/Makefiles/gmake/depend.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/depend.mak 2008-06-05 08:57:35 UTC (rev 1886)
+++ trunk/complement/explore/Makefiles/gmake/depend.mak 2008-06-06 12:29:52 UTC (rev 1887)
@@ -1,6 +1,6 @@
# Time-stamp: <07/02/05 12:57:11 ptr>
#
-# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006, 2008
# Petr Ovtchenkov
#
# Portion Copyright (c) 1999-2001
@@ -35,9 +35,9 @@
@cat -s $(_ALL_DEP) /dev/null > $(DEPENDS_COLLECTION)
TAGS: $(OUTPUT_DIRS) ${_DASH_DEP}
- @cat -s $(_ALL_DEP) /dev/null | sed -e 's/^.*://;s/^ *//;s/\\$$//;s/ $$//;s/ /\n/g' | sort | uniq | xargs etags -i -m
+ @cat -s $(_ALL_DEP) /dev/null | sed -e 's/^.*://;s/^ *//;s/\\$$//;s/ $$//;s/ /\n/g' | sort | uniq | xargs etags -I --declarations
tags: $(OUTPUT_DIRS) ${_DASH_DEP}
- @cat -s $(_ALL_DEP) /dev/null | sed -e 's/^.*://;s/^ *//;s/\\$$//;s/ $$//;s/ /\n/g' | sort | uniq | ctags -d --globals --declarations -t -w
+ @cat -s $(_ALL_DEP) /dev/null | sed -e 's/^.*://;s/^ *//;s/\\$$//;s/ $$//;s/ /\n/g' | sort | uniq | xargs ctags -d --globals --declarations -t -T
-include $(DEPENDS_COLLECTION)
Modified: trunk/complement/explore/Makefiles/gmake/targetdirs.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/targetdirs.mak 2008-06-05 08:57:35 UTC (rev 1886)
+++ trunk/complement/explore/Makefiles/gmake/targetdirs.mak 2008-06-06 12:29:52 UTC (rev 1887)
@@ -36,12 +36,11 @@
OUTPUT_DIR_A_STLDBG := $(OUTPUT_DIR_STLDBG)
endif
-# BASE_INSTALL_DIR ?= ${SRCROOT}/build/$(TARGET_NAME)
-BASE_INSTALL_DIR ?= $(DESTDIR)/usr/local
+BASE_INSTALL_DIR ?= /usr/local
-BASE_INSTALL_LIB_DIR ?= ${BASE_INSTALL_DIR}
-BASE_INSTALL_BIN_DIR ?= ${BASE_INSTALL_DIR}
-BASE_INSTALL_HDR_DIR ?= ${BASE_INSTALL_DIR}
+BASE_INSTALL_LIB_DIR ?= $(DESTDIR)${BASE_INSTALL_DIR}
+BASE_INSTALL_BIN_DIR ?= $(DESTDIR)${BASE_INSTALL_DIR}
+BASE_INSTALL_HDR_DIR ?= $(DESTDIR)${BASE_INSTALL_DIR}
INSTALL_LIB_DIR ?= ${BASE_INSTALL_LIB_DIR}/${TARGET_NAME}lib
INSTALL_LIB_DIR_DBG ?= ${BASE_INSTALL_LIB_DIR}/${TARGET_NAME}lib
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2008-06-16 13:30:56
|
Revision: 1899
http://complement.svn.sourceforge.net/complement/?rev=1899&view=rev
Author: complement
Date: 2008-06-16 06:30:53 -0700 (Mon, 16 Jun 2008)
Log Message:
-----------
function to pass tag for make in subdirs
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
trunk/complement/explore/Makefiles/gmake/subdirs.mak
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2008-06-16 10:39:08 UTC (rev 1898)
+++ trunk/complement/explore/Makefiles/ChangeLog 2008-06-16 13:30:53 UTC (rev 1899)
@@ -1,3 +1,8 @@
+2008-06-16 Petr Ovtchenkov <pt...@is...>
+
+ * gmake/subdirs.mak: function to pass tag for make in
+ subdirs.
+
2008-06-07 Petr Ovtchenkov <pt...@is...>
* configure: don't duplicate options in config.mak, that
Modified: trunk/complement/explore/Makefiles/gmake/subdirs.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/subdirs.mak 2008-06-16 10:39:08 UTC (rev 1898)
+++ trunk/complement/explore/Makefiles/gmake/subdirs.mak 2008-06-16 13:30:53 UTC (rev 1899)
@@ -1,12 +1,17 @@
-# Time-stamp: <06/11/01 22:55:23 ptr>
+# Time-stamp: <08/06/16 16:31:11 yeti>
#
-# Copyright (c) 2006, 2007
+# Copyright (c) 2006-2008
# Petr Ovtchenkov
#
# Licensed under the Academic Free License version 3.0
#
-# Do the same target in all catalogs as arg
+# Do the same target in all catalogs specified in arg
define doinsubdirs
$(foreach d,$(1),${MAKE} -C ${d} $@;)
endef
+
+# Do specified target (first arg) in all catalogs specified by second arg
+define dotaginsubdirs
+$(foreach d,$(2),${MAKE} -C ${d} $(1);)
+endef
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X