[complement-svn] SF.net SVN: complement: [1585] trunk/complement/explore
Status: Pre-Alpha
Brought to you by:
complement
Menu
▾
▴
[complement-svn] SF.net SVN: complement: [1585] trunk/complement/explore
|
From: <com...@us...> - 2007-06-08 19:40:28
|
Revision: 1585
http://svn.sourceforge.net/complement/?rev=1585&view=rev
Author: complement
Date: 2007-06-08 12:40:15 -0700 (Fri, 08 Jun 2007)
Log Message:
-----------
move gmake-specific files into gmake catalog
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
trunk/complement/explore/Makefiles/gmake/app/top.mak
trunk/complement/explore/Makefiles/gmake/lib/top.mak
trunk/complement/explore/Makefiles/top.mak
trunk/complement/explore/configure
Added Paths:
-----------
trunk/complement/explore/Makefiles/gmake/clean.mak
trunk/complement/explore/Makefiles/gmake/extern.mak
Removed Paths:
-------------
trunk/complement/explore/Makefiles/clean.mak
trunk/complement/explore/Makefiles/extern.mak
Property Changed:
----------------
trunk/complement/explore/Makefiles/
trunk/complement/explore/Makefiles/gmake/
Property changes on: trunk/complement/explore/Makefiles
___________________________________________________________________
Name: svn:ignore
- config.mak
+
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2007-06-06 18:03:04 UTC (rev 1584)
+++ trunk/complement/explore/Makefiles/ChangeLog 2007-06-08 19:40:15 UTC (rev 1585)
@@ -1,3 +1,12 @@
+2007-06-08 Petr Ovtchenkov <pt...@is...>
+
+ * clean.mak, extern.mak, config.mak: move to gmake catalog
+
+ * top.mak: move some files in gmake catalog; replace USE_MAKE
+ by gmake;
+
+ * gmake/app/top.mak, gmake/lib/top.mak: replace USE_MAKE by gmake.
+
2007-05-31 Petr Ovtchenkov <pt...@is...>
* gmake/app/gcc.mak, gmake/targets.mak, gmake/windows/rules-so.mak:
Deleted: trunk/complement/explore/Makefiles/clean.mak
===================================================================
--- trunk/complement/explore/Makefiles/clean.mak 2007-06-06 18:03:04 UTC (rev 1584)
+++ trunk/complement/explore/Makefiles/clean.mak 2007-06-08 19:40:15 UTC (rev 1585)
@@ -1,48 +0,0 @@
-# -*- Makefile -*- Time-stamp: <06/11/17 00:25:42 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 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)
- @-rm -f TAGS tags
-
-maintainer-clean:: distclean
- @rm -f ${RULESBASE}/config.mak
- @-rm -f TAGS tags
Deleted: trunk/complement/explore/Makefiles/extern.mak
===================================================================
--- trunk/complement/explore/Makefiles/extern.mak 2007-06-06 18:03:04 UTC (rev 1584)
+++ trunk/complement/explore/Makefiles/extern.mak 2007-06-08 19:40:15 UTC (rev 1585)
@@ -1,40 +0,0 @@
-# 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
Property changes on: trunk/complement/explore/Makefiles/gmake
___________________________________________________________________
Name: svn:ignore
+ config.mak
Modified: trunk/complement/explore/Makefiles/gmake/app/top.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/top.mak 2007-06-06 18:03:04 UTC (rev 1584)
+++ trunk/complement/explore/Makefiles/gmake/app/top.mak 2007-06-08 19:40:15 UTC (rev 1585)
@@ -1,6 +1,6 @@
-# -*- makefile -*- Time-stamp: <07/03/08 21:59:26 ptr>
+# -*- makefile -*- Time-stamp: <07/06/08 23:35:09 ptr>
#
-# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
# Petr Ovtchenkov
#
# Portion Copyright (c) 1999-2001
@@ -33,9 +33,9 @@
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}/gmake/app/${COMPILER_NAME}.mak
+include ${RULESBASE}/gmake/app/rules.mak
+include ${RULESBASE}/gmake/app/rules-install.mak
define prog_clean
clean::
Copied: trunk/complement/explore/Makefiles/gmake/clean.mak (from rev 1582, trunk/complement/explore/Makefiles/clean.mak)
===================================================================
--- trunk/complement/explore/Makefiles/gmake/clean.mak (rev 0)
+++ trunk/complement/explore/Makefiles/gmake/clean.mak 2007-06-08 19:40:15 UTC (rev 1585)
@@ -0,0 +1,48 @@
+# -*- Makefile -*- Time-stamp: <06/11/17 00:25:42 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 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)
+ @-rm -f TAGS tags
+
+maintainer-clean:: distclean
+ @rm -f ${RULESBASE}/config.mak
+ @-rm -f TAGS tags
Copied: trunk/complement/explore/Makefiles/gmake/extern.mak (from rev 1582, trunk/complement/explore/Makefiles/extern.mak)
===================================================================
--- trunk/complement/explore/Makefiles/gmake/extern.mak (rev 0)
+++ trunk/complement/explore/Makefiles/gmake/extern.mak 2007-06-08 19:40:15 UTC (rev 1585)
@@ -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/lib/top.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/top.mak 2007-06-06 18:03:04 UTC (rev 1584)
+++ trunk/complement/explore/Makefiles/gmake/lib/top.mak 2007-06-08 19:40:15 UTC (rev 1585)
@@ -1,6 +1,6 @@
-# -*- makefile -*- Time-stamp: <03/10/10 16:15:53 ptr>
+# -*- makefile -*- Time-stamp: <07/06/08 23:34:51 ptr>
#
-# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
# Petr Ovtchenkov
#
# Portion Copyright (c) 1999-2001
@@ -12,26 +12,26 @@
LDFLAGS ?=
ifneq ("$(findstring $(OSNAME),darwin windows)","")
-include ${RULESBASE}/${USE_MAKE}/${OSNAME}/lib.mak
+include ${RULESBASE}/gmake/${OSNAME}/lib.mak
else
-include ${RULESBASE}/${USE_MAKE}/unix/lib.mak
+include ${RULESBASE}/gmake/unix/lib.mak
endif
-include ${RULESBASE}/${USE_MAKE}/lib/${COMPILER_NAME}.mak
+include ${RULESBASE}/gmake/lib/${COMPILER_NAME}.mak
ifneq ("$(findstring $(OSNAME),windows)","")
-include ${RULESBASE}/${USE_MAKE}/${OSNAME}/rules-so.mak
+include ${RULESBASE}/gmake/${OSNAME}/rules-so.mak
else
-include ${RULESBASE}/${USE_MAKE}/unix/rules-so.mak
+include ${RULESBASE}/gmake/unix/rules-so.mak
endif
-include ${RULESBASE}/${USE_MAKE}/lib/rules-a.mak
+include ${RULESBASE}/gmake/lib/rules-a.mak
ifneq ("$(findstring $(OSNAME),windows)","")
-include ${RULESBASE}/${USE_MAKE}/${OSNAME}/rules-install-so.mak
+include ${RULESBASE}/gmake/${OSNAME}/rules-install-so.mak
else
-include ${RULESBASE}/${USE_MAKE}/unix/rules-install-so.mak
+include ${RULESBASE}/gmake/unix/rules-install-so.mak
endif
-include ${RULESBASE}/${USE_MAKE}/lib/rules-install-a.mak
-include ${RULESBASE}/${USE_MAKE}/lib/clean.mak
+include ${RULESBASE}/gmake/lib/rules-install-a.mak
+include ${RULESBASE}/gmake/lib/clean.mak
Modified: trunk/complement/explore/Makefiles/top.mak
===================================================================
--- trunk/complement/explore/Makefiles/top.mak 2007-06-06 18:03:04 UTC (rev 1584)
+++ trunk/complement/explore/Makefiles/top.mak 2007-06-08 19:40:15 UTC (rev 1585)
@@ -1,4 +1,4 @@
-# Time-stamp: <07/03/08 22:57:35 ptr>
+# Time-stamp: <07/06/08 23:23:03 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -18,7 +18,7 @@
RULESBASE ?= $(SRCROOT)/Makefiles
# include file, generated by configure, if available
--include ${RULESBASE}/config.mak
+-include ${RULESBASE}/gmake/config.mak
ifndef COMPILER_NAME
# gcc is default compiler, others specify explicitly;
@@ -73,47 +73,44 @@
NOT_USE_NOSTDLIB := 1
endif
-# define what make clone we use
-USE_MAKE := gmake
-
ifndef OSNAME
# identify OS and build date
-include ${RULESBASE}/$(USE_MAKE)/sysid.mak
+include ${RULESBASE}/gmake/sysid.mak
endif
# OS-specific definitions, like ln, install, etc. (guest host)
-include ${RULESBASE}/$(USE_MAKE)/$(BUILD_OSNAME)/sys.mak
+include ${RULESBASE}/gmake/$(BUILD_OSNAME)/sys.mak
# target OS-specific definitions, like ar, etc.
-include ${RULESBASE}/$(USE_MAKE)/$(OSNAME)/targetsys.mak
+include ${RULESBASE}/gmake/$(OSNAME)/targetsys.mak
# compiler, compiler options
-include ${RULESBASE}/$(USE_MAKE)/$(COMPILER_NAME).mak
+include ${RULESBASE}/gmake/$(COMPILER_NAME).mak
# rules to make dirs for targets
-include ${RULESBASE}/$(USE_MAKE)/targetdirs.mak
+include ${RULESBASE}/gmake/targetdirs.mak
# Extern projects for everyday usage and settings for ones
-include ${RULESBASE}/extern.mak
+include ${RULESBASE}/gmake/extern.mak
# os-specific local rules (or other project-specific definitions)
-include specific.mak
# derive common targets (*.o, *.d),
# build rules (including output catalogs)
-include ${RULESBASE}/$(USE_MAKE)/targets.mak
+include ${RULESBASE}/gmake/targets.mak
# dependency
-include ${RULESBASE}/$(USE_MAKE)/depend.mak
+include ${RULESBASE}/gmake/depend.mak
# general clean
-include ${RULESBASE}/clean.mak
+include ${RULESBASE}/gmake/clean.mak
# if target is library, rules for library
ifdef LIBNAME
-include ${RULESBASE}/$(USE_MAKE)/lib/top.mak
+include ${RULESBASE}/gmake/lib/top.mak
endif
# if target is program, rules for executable
ifdef PRGNAME
-include ${RULESBASE}/$(USE_MAKE)/app/top.mak
+include ${RULESBASE}/gmake/app/top.mak
else
ifdef PRGNAMES
-include ${RULESBASE}/$(USE_MAKE)/app/top.mak
+include ${RULESBASE}/gmake/app/top.mak
endif
endif
Modified: trunk/complement/explore/configure
===================================================================
--- trunk/complement/explore/configure 2007-06-06 18:03:04 UTC (rev 1584)
+++ trunk/complement/explore/configure 2007-06-08 19:40:15 UTC (rev 1585)
@@ -1,8 +1,8 @@
#!/bin/sh
-# Time-stamp: <06/11/10 15:47:21 ptr>
+# Time-stamp: <07/06/08 23:24:03 ptr>
-configmak=Makefiles/config.mak
+configmak=Makefiles/gmake/config.mak
# rm -f ${configmak}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
