[complement-svn] SF.net SVN: complement: [1903] branches/complement-sockios/explore/ Makefiles

[<com...@us...>]

Revision: 1903
          http://complement.svn.sourceforge.net/complement/?rev=1903&view=rev
Author:   complement
Date:     2008-06-25 22:40:45 -0700 (Wed, 25 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:
--------------
    branches/complement-sockios/explore/Makefiles/ChangeLog
    branches/complement-sockios/explore/Makefiles/gmake/depend.mak
    branches/complement-sockios/explore/Makefiles/gmake/targetdirs.mak

Modified: branches/complement-sockios/explore/Makefiles/ChangeLog
===================================================================
--- branches/complement-sockios/explore/Makefiles/ChangeLog	2008-06-26 05:40:30 UTC (rev 1902)
+++ branches/complement-sockios/explore/Makefiles/ChangeLog	2008-06-26 05:40:45 UTC (rev 1903)
@@ -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: branches/complement-sockios/explore/Makefiles/gmake/depend.mak
===================================================================
--- branches/complement-sockios/explore/Makefiles/gmake/depend.mak	2008-06-26 05:40:30 UTC (rev 1902)
+++ branches/complement-sockios/explore/Makefiles/gmake/depend.mak	2008-06-26 05:40:45 UTC (rev 1903)
@@ -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: branches/complement-sockios/explore/Makefiles/gmake/targetdirs.mak
===================================================================
--- branches/complement-sockios/explore/Makefiles/gmake/targetdirs.mak	2008-06-26 05:40:30 UTC (rev 1902)
+++ branches/complement-sockios/explore/Makefiles/gmake/targetdirs.mak	2008-06-26 05:40:45 UTC (rev 1903)
@@ -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.