Changeset 36

Timestamp:

Apr 25, 2003, 6:51:55 PM (22 years ago)

Author:

bird

Message:

VPATH path separator fix.

Location:

trunk/src/gcc/libstdc++-v3/src

Files:

• Makefile.am (modified) (6 diffs, 1 prop)
• Makefile.in (modified) (9 diffs, 1 prop)

trunk/src/gcc/libstdc++-v3/src/Makefile.am

@@ -42 +42 @@
 # NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
 CONFIG_CXXFLAGS = \
-        @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @DEBUG_FLAGS@ 
+        @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @DEBUG_FLAGS@
 
 # Warning flags to use.
@@ -75 +75 @@
 target_sources_extra = \
         basic_file.cc \
-        c++locale.cc 
+        c++locale.cc
 
 # Sources present in the src directory.
@@ -110 +110 @@
         ${target_sources_extra}
 
-VPATH = $(top_srcdir)/src:$(top_srcdir)
+PATH_SEPARATOR =? :
+VPATH = $(top_srcdir)/src$(PATH_SEPARATOR)$(top_srcdir)
 
 libstdc___la_SOURCES = $(sources)
@@ -126 +127 @@
 libstdc___la_LDFLAGS = \
         -version-info @libtool_VERSION@ ${version_arg} \
-        -lm @LIBUNWIND_FLAG@ 
+        -lm @LIBUNWIND_FLAG@
 
 libstdc___la_DEPENDENCIES = $(libstdc___la_LIBADD) linker.map
@@ -157 +158 @@
         $(WARN_CXXFLAGS) \
         $(OPTIMIZE_CXXFLAGS) \
-        $(CONFIG_CXXFLAGS) 
+        $(CONFIG_CXXFLAGS)
 
 
@@ -179 +180 @@
 # attempt to infer which configuration to use
 LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \
-               $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) 
+               $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)
 
 # 3) We'd have a problem when building the shared libstdc++ object if

trunk/src/gcc/libstdc++-v3/src/Makefile.in

@@ -146 +146 @@
 # NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
 CONFIG_CXXFLAGS = \
-        @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @DEBUG_FLAGS@ 
+        @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @DEBUG_FLAGS@
 
 
@@ -183 +183 @@
 target_sources_extra = \
         basic_file.cc \
-        c++locale.cc 
+        c++locale.cc
 
 
@@ -220 +220 @@
 
 
+PATH_SEPARATOR =? :
 VPATH = $(top_srcdir)/src:$(top_srcdir)
 
@@ -229 +230 @@
 
 @GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@version_arg = @GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@-Wl,--version-script=linker.map
-@GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE@version_arg = 
+@GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE@version_arg =
 
 libstdc___la_LDFLAGS = \
         -version-info @libtool_VERSION@ ${version_arg} \
-        -lm @LIBUNWIND_FLAG@ 
+        -lm @LIBUNWIND_FLAG@
 
 
@@ -252 +253 @@
         $(WARN_CXXFLAGS) \
         $(OPTIMIZE_CXXFLAGS) \
-        $(CONFIG_CXXFLAGS) 
+        $(CONFIG_CXXFLAGS)
 
 
@@ -274 +275 @@
 # attempt to infer which configuration to use
 LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \
-               $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) 
+               $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)
 
 
@@ -287 +288 @@
 
 CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
+CONFIG_CLEAN_FILES =
 LTLIBRARIES =  $(toolexeclib_LTLIBRARIES)
 
@@ -320 +321 @@
 .SUFFIXES:
 .SUFFIXES: .S .c .cc .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
         cd $(top_srcdir) && $(AUTOMAKE) --cygnus src/Makefile
 
@@ -458 +459 @@
 installcheck-am:
 installcheck: installcheck-am
-install-info-am: 
+install-info-am:
 install-info: install-info-am
 install-exec-am: install-toolexeclibLTLIBRARIES