Re: busted 'make swig-py'...

On Fri, Feb 28, 2003 at 03:58:10PM -0800, Greg Stein wrote:
> On Fri, Feb 28, 2003 at 03:11:16PM -0800, Matt Kraai wrote:
> >...
> > +++ build/gen_make.py (working copy)
> > @@ -208,14 +208,16 @@
> >
> > 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)\n'
> > - % (objname, deps, string.upper(objname.lang_abbrev)))
> > + self.ofile.write('%s: %s\n\t$(RUN_SWIG_%s) %s\n'
> > + % (objname, deps, string.upper(objname.lang_abbrev),
> > + deps))
>
> We don't want all of the deps. Just the first one, which is sources[0].
>
> > for objname, sources in self.graph.get_deps(gen_base.DT_OBJECT):
> > deps = string.join(sources)
> > cmd = getattr(objname, 'build_cmd', '')
> > if cmd:
> > - self.ofile.write('%s: %s\n\t%s\n' % (objname, deps, cmd))
> > + self.ofile.write('%s: %s\n\t%s %s\n'
> > + % (objname, deps, cmd, deps.split()[0]))
>
> No need to split. Just use sources[0].

Could a BSD user please test the following, then?

Matt

-- 
Oink!
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 5141)
+++ Makefile.in	(working copy)
@@ -117,11 +117,11 @@
 LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
 
 # special compilation for files destined for mod_dav_svn
-COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c $<
+COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c
 
 # special compilation for files destined for libsvn_swig_* (e.g. swigutil_*.c)
-COMPILE_SWIG_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) -DSWIGPYTHON $(CFLAGS) $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@ -c $<
-COMPILE_SWIG_JAVA = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(SWIG_JAVA_INCLUDES) $(INCLUDES) -o $@ -c $<
+COMPILE_SWIG_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) -DSWIGPYTHON $(CFLAGS) $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@ -c
+COMPILE_SWIG_JAVA = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(SWIG_JAVA_INCLUDES) $(INCLUDES) -o $@ -c
 
 LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
 
@@ -130,12 +130,12 @@
 
 # these commands run SWIG to generate wrapper source files (*.c)
 ### should we protect against swig not being available?
-RUN_SWIG_PY = $(SWIG) -c -python -noproxy $(SWIG_INCLUDES) $(SWIG_PY_INCLUDES) -o $@ $<
-RUN_SWIG_JAVA = cd ${SWIG_SRC_DIR}/java/org/tigris/subversion/swig && $(SWIG) -c -java -noproxy -package 'org.tigris.subversion.swig' $(SWIG_INCLUDES) -o ${abs_builddir}/$@ ${abs_builddir}/$<
+RUN_SWIG_PY = $(SWIG) -c -python -noproxy $(SWIG_INCLUDES) $(SWIG_PY_INCLUDES) -o $@
+RUN_SWIG_JAVA = cd ${SWIG_SRC_DIR}/java/org/tigris/subversion/swig && $(SWIG) -c -java -noproxy -package 'org.tigris.subversion.swig' $(SWIG_INCLUDES) -o ${abs_builddir}/$@
 
 # Compilation of SWIG-generated C source code
-COMPILE_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(SWIG_INCLUDES) $(SWIG_PY_INCLUDES) -prefer-pic -c -o $@ $<
-COMPILE_JAVA_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_JAVA_COMPILE) -DSWIGJAVA $(SWIG_INCLUDES) $(SWIG_JAVA_INCLUDES) -prefer-pic -c -o $@ $<
+COMPILE_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(SWIG_INCLUDES) $(SWIG_PY_INCLUDES) -prefer-pic -c -o $@
+COMPILE_JAVA_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_JAVA_COMPILE) -DSWIGJAVA $(SWIG_INCLUDES) $(SWIG_JAVA_INCLUDES) -prefer-pic -c -o $@
 
 # these commands link the wrapper objects into an extension library/module
 LINK_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_PY_LINK) $(SWIG_LDFLAGS) -rpath $(swig_pydir) -avoid-version -module
Index: build/gen_make.py
===================================================================
--- build/gen_make.py	(revision 5141)
+++ build/gen_make.py	(working copy)
@@ -208,14 +208,15 @@
 
     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)\n'
-                       % (objname, deps, string.upper(objname.lang_abbrev)))
+      self.ofile.write('%s: %s\n\t$(RUN_SWIG_%s) %s\n'
+                       % (objname, deps, string.upper(objname.lang_abbrev),
+                          sources[0]))
 
     for objname, sources in self.graph.get_deps(gen_base.DT_OBJECT):
       deps = string.join(sources)
       cmd = getattr(objname, 'build_cmd', '')
       if cmd:
-        self.ofile.write('%s: %s\n\t%s\n' % (objname, deps, cmd))
+        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