You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by se...@apache.org on 2006/08/03 00:58:36 UTC
svn commit: r428184 - in /incubator/stdcxx/trunk: GNUmakefile
etc/config/makefile.common
Author: sebor
Date: Wed Aug 2 15:58:36 2006
New Revision: 428184
URL: http://svn.apache.org/viewvc?rev=428184&view=rev
Log:
2006-08-02 Martin Sebor <se...@roguewave.com>
* GNUmakefile (BINDIR, LIBDIR): Removed from makefile.in.
* makefile.common (BINDIR, LIBDIR): Defined.
Modified:
incubator/stdcxx/trunk/GNUmakefile
incubator/stdcxx/trunk/etc/config/makefile.common
Modified: incubator/stdcxx/trunk/GNUmakefile
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/GNUmakefile?rev=428184&r1=428183&r2=428184&view=diff
==============================================================================
--- incubator/stdcxx/trunk/GNUmakefile (original)
+++ incubator/stdcxx/trunk/GNUmakefile Wed Aug 2 15:58:36 2006
@@ -99,8 +99,6 @@
# LIBBASE - name of the library w/o the suffix suitable
# for use by the linker after the -l option
#
-# LIBDIR - the directory where the library will be built
-#
# DEPENDDIR - the subdirectory where dependency files will reside
#
# LIBNAME - full name of the library being built
@@ -581,8 +579,6 @@
&& [ "$(MAPFILE)" = "" ] \
|| echo "MAPFILE = $$""(TOPDIR)/$(MAPFILE)" >> $(MAKEFILE_IN) \
&& echo "RUNFLAGS = -t 180" >> $(MAKEFILE_IN) \
- && echo "LIBDIR = $$""(BUILDDIR)/lib" >> $(MAKEFILE_IN) \
- && echo "BINDIR = $$""(BUILDDIR)/bin" >> $(MAKEFILE_IN) \
&& echo "DEPENDDIR = $(DEPENDDIR)" >> $(MAKEFILE_IN) \
&& echo "PHDIR = $(PHDIR)" >> $(MAKEFILE_IN) \
&& echo "PHWARNFLAGS = $(PHWARNFLAGS)" >> $(MAKEFILE_IN) \
Modified: incubator/stdcxx/trunk/etc/config/makefile.common
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/makefile.common?rev=428184&r1=428183&r2=428184&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/makefile.common (original)
+++ incubator/stdcxx/trunk/etc/config/makefile.common Wed Aug 2 15:58:36 2006
@@ -11,6 +11,10 @@
# specify path to find to avoid problems with example named 'find'
FIND = /usr/bin/find
+# set common variables used in makefiles
+BINDIR = $(BUILDDIR)/bin
+LIBDIR = $(BUILDDIR)/lib
+
# provide a value if it isn't already set by make
ifeq ($(CURDIR),)
CURDIR := $(shell pwd)