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. |