Re: svn commit: rev 5156 - in trunk: . build

On Sat, Mar 01, 2003 at 09:52:38AM -0800, Matt Kraai wrote:
> > This breaks a build outside the source dir.
>
> Doh, sorry.
>
> > /bin/sh /home/pm/sw/subversion/obj/libtool --silent --mode=compile gcc -DLINUX=2 -D_REENTRANT -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE -g -O2 -Wwrite-strings -Wsequence-point -Wparentheses -Wall -Wshadow -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DSVN_DEBUG -pthread -DNEON_ZLIB -DNEON_SSL -I/usr/local/apache2/include -I../svn/subversion/include -I. -I/usr/local/neon-0.23.5/include/neon -I/usr/local/apache2/include -I/usr/local/apache2/include -o subversion/mod_dav_svn/activity.lo -c subversion/mod_dav_svn/activity.c
> > gcc: subversion/mod_dav_svn/activity.c: No such file or directory
> > gcc: no input files
> >
> > In my build that needs to be ../svn/subversion/mod_dav_svn/activity.c.
> > How about this? Is it acceptable for gen_make to hard code
> > top_srcdir?
>
> We already do; there's always room for one more.

Actually, this leaves the SWIG build outside the source dir
broken. Could you test the following instead?

Matt

-- 
Oink!
Index: build/gen_base.py
===================================================================
--- build/gen_base.py	(revision 5155)
+++ build/gen_base.py	(working copy)
@@ -264,6 +264,7 @@
     self.lang_abbrev = lang_abbrev[lang]
     ### hmm. this is Makefile-specific
     self.build_cmd = '$(COMPILE_%s_WRAPPER)' % string.upper(self.lang_abbrev)
+    self.source_generated = 1
 
 # the SWIG utility libraries
 class SWIGUtilPython(ObjectFile):
Index: build/gen_make.py
===================================================================
--- build/gen_make.py	(revision 5156)
+++ build/gen_make.py	(working copy)
@@ -205,7 +205,7 @@
 
     for objname, sources in self.graph.get_deps(gen_base.DT_SWIG_C):
       deps = string.join(sources)
-      self.ofile.write('%s: %s\n\t$(RUN_SWIG_%s) %s\n'
+      self.ofile.write('%s: %s\n\t$(RUN_SWIG_%s) $(top_srcdir)/%s\n'
                        % (objname, deps, string.upper(objname.lang_abbrev),
                           sources[0]))
 
@@ -213,7 +213,12 @@
       deps = string.join(sources)
       cmd = getattr(objname, 'build_cmd', '')
       if cmd:
-        self.ofile.write('%s: %s\n\t%s %s\n' % (objname, deps, cmd, sources[0]))
+        if not getattr(objname, 'source_generated', 0):
+          self.ofile.write('%s: %s\n\t%s $(top_srcdir)/%s\n'
+                           % (objname, deps, cmd, sources[0]))
+        else:
+          self.ofile.write('%s: %s\n\t%s %s\n'
+                           % (objname, deps, cmd, sources[0]))
       else:
         self.ofile.write('%s: %s\n' % (objname, deps))
 
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org