This is the mail archive of the libstdc++@gcc.gnu.org mailing list for the libstdc++ project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [patch, libstdc++-v3]


Paolo Bonzini wrote:
Paolo Carlini wrote:
Hi,
GNU Make documentation specifies that either space or ':' should be
used as path separator for VPATH. The latest changes however to ';'
for DJGPP (i?86-pc-msdosdjgpp). As result use of ':' as VPATH
separator in Makefile.in is incompatible with DJGPP.
Paolo, can you help with this patch / issue? By the way, I'm seeing a
colon in libgomp/Makefile.am too...

Andris, I prefer if you used


vpath % PATH

instead of the VPATH variable, and furthermore if you used

  vpath % PATH1
  vpath % PATH2

instead of

vpath % PATH1 PATH2

Could you make a sweep through the entire source tree (libgomp, gcc, libstdc++-v3, I don't know if there are more)? If you CC me, I'll approve the patch.
Attaching patches (separately for gcc, libgomp and libstdc++-v3). I don't have SVN write access. So I cannot commit it myself.

Andris

2007-11-25  Andris Pavenis <andris.pavenis@iki.fi>
	    
	* Makefile.in: Use separate vpath lines
        for each path.


Index: gcc/Makefile.in
===================================================================
--- gcc/Makefile.in	(revision 130408)
+++ gcc/Makefile.in	(working copy)
@@ -111,7 +111,8 @@
 # pattern rule for everything.
 # This vpath could be extended within the Make-lang fragments.
 
-vpath %.texi $(gcc_docdir):$(gcc_docdir)/include
+vpath %.texi $(gcc_docdir)
+vpath %.texi $(gcc_docdir)/include
 
 # ----
 # Default values for variables overridden in Makefile fragments.
2007-11-25  Andris Pavenis <andris.pavenis@iki.fi>

	* Makefile.am: Use space as vpath separator.
	Use 'vpath %' instead of 'VPATH ='.
	* Makefile.in: Regenerate.


Index: libgomp/Makefile.am
===================================================================
--- libgomp/Makefile.am	(revision 130408)
+++ libgomp/Makefile.am	(working copy)
@@ -14,7 +14,7 @@
 
 empty =
 space = $(empty) $(empty)
-VPATH = $(subst $(space),:,$(strip $(search_path)))
+vpath % $(strip $(search_path))
 
 AM_CPPFLAGS = $(addprefix -I, $(search_path))
 AM_CFLAGS = $(XCFLAGS)
2007-11-25  Andris Pavenis <andris.pavenis@iki.fi>

	* src/Makefile.am: Use separate vpath lines
        for each path.
	* src/Makefile.in: Regenerate.


Index: libstdc++-v3/src/Makefile.am
===================================================================
--- libstdc++-v3/src/Makefile.am	(revision 130408)
+++ libstdc++-v3/src/Makefile.am	(working copy)
@@ -182,7 +182,8 @@
 	${host_sources} \
 	${host_sources_extra} 
 
-VPATH = $(top_srcdir)/src:$(top_srcdir)
+vpath % $(top_srcdir)/src
+vpath % $(top_srcdir)
 
 libstdc___la_SOURCES = $(sources)
 

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]