Author: sebor
Date: Tue Apr 3 18:27:41 2007
New Revision: 525347
URL: http://svn.apache.org/viewvc?view=rev&rev=525347
Log:
2007-04-03 Martin Sebor <[EMAIL PROTECTED]>
* GNUmakefile.tst (RWTESTDIR): Removed redundant variable.
(INCLUDES): Removed $(RWTESTDIR)/include (a duplicate of
$(TESTDIR)/include).
* GNUmakefile.rwt (SRCDIRS, INCLUDE, VPATH): Removed redundant
references to $(RWTESTDIR).
(TARGET): Removed incorrect/unused variable.
Modified:
incubator/stdcxx/trunk/etc/config/GNUmakefile.rwt
incubator/stdcxx/trunk/etc/config/GNUmakefile.tst
Modified: incubator/stdcxx/trunk/etc/config/GNUmakefile.rwt
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/GNUmakefile.rwt?view=diff&rev=525347&r1=525346&r2=525347
==============================================================================
--- incubator/stdcxx/trunk/etc/config/GNUmakefile.rwt (original)
+++ incubator/stdcxx/trunk/etc/config/GNUmakefile.rwt Tue Apr 3 18:27:41 2007
@@ -18,11 +18,8 @@
# The place where the sources are looked for;
# used in the variables setup in makefile.common
-RWTESTDIR = $(TOPDIR)/../rwtest
TESTDIR = $(TOPDIR)/tests
-SRCDIRS = $(RWTESTDIR)/src $(TOPDIR)/tests/src
-
-TARGET = $(RWTESTDIR)/$(RWTESTLIB)
+SRCDIRS = $(TESTDIR)/src
# include common variables setting for all makefiles
ONE_REPOSITORY = 1
@@ -35,10 +32,10 @@
RWTESTLIB = librwtest$(BUILDTYPE)$(LIBSUFFIX)
# Additional include directories:
-INCLUDES += -I$(RWTESTDIR) -I$(TESTDIR)/include
+INCLUDES += -I$(TESTDIR)/include
# VPATH to look for sources in (appended dir for test.cpp)
-VPATH += $(RWTESTDIR)/src $(TESTDIR)/src
+VPATH += $(TESTDIR)/src
# For xlC 5.0.2.0
ifneq ($(DEFAULT_SHROBJ),)
Modified: incubator/stdcxx/trunk/etc/config/GNUmakefile.tst
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/GNUmakefile.tst?view=diff&rev=525347&r1=525346&r2=525347
==============================================================================
--- incubator/stdcxx/trunk/etc/config/GNUmakefile.tst (original)
+++ incubator/stdcxx/trunk/etc/config/GNUmakefile.tst Tue Apr 3 18:27:41 2007
@@ -31,7 +31,6 @@
include ../makefile.in
# tests & rwtest library directories
-RWTESTDIR = $(TOPDIR)/../rwtest
TESTDIR = $(TOPDIR)/tests
# get the test suite subdirectories minus those known
@@ -59,7 +58,7 @@
RWTLIBNAME = lib$(RWTLIBBASE).a
# Add to include dirs and link flags:
-INCLUDES += -I$(RWTESTDIR)/include -I$(TESTDIR)/include
+INCLUDES += -I$(TESTDIR)/include
LDFLAGS := -L$(BUILDDIR)/rwtest -l$(RWTLIBBASE) $(LDFLAGS)
# targets to be built: object files for sources in the source directories
