Update of /cvsroot/mahogany/M/src/Python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13168/src/Python

Modified Files:
        Names.mk 
Log Message:
fixed build when using swig after last commit

Index: Names.mk
===================================================================
RCS file: /cvsroot/mahogany/M/src/Python/Names.mk,v
retrieving revision 1.15
retrieving revision 1.16
diff -b -u -2 -r1.15 -r1.16
--- Names.mk    16 Jan 2006 02:32:06 -0000      1.15
+++ Names.mk    16 Jan 2006 03:27:52 -0000      1.16
@@ -28,14 +28,17 @@
 # need for dynamic Python linking to work
 define create_cpp
-       $(SWIG) -I$(IFACE_DIR) $(CPPFLAGS) $(SWIGFLAGS) -o $*.cpp $< && \
-           sed -e 's/Python\.h/MPython.h/' $*.cpp > $*.cpp.new && \
-               mv $*.cpp.new $*.cpp
+       $(SWIG) -I$(IFACE_DIR) $(CPPFLAGS) $(SWIGFLAGS) -o $*.cpp.tmp $< && \
+           sed -e 's/Python\.h/MPython.h/' $*.cpp.tmp > $(@:.o=.cpp) && \
+               rm $*.cpp.tmp
 endef
 
 SWIGFLAGS := -c++ -python
 vpath %.i $(IFACE_DIR)
+
 Python/%.o Python/%.py: %.i
        $(create_cpp)
+       mv -f $*.py Python
        $(M_COMPILE_SWIG)
+       @rm -f Python/%.cpp
 
 # define rule for copying the swig-generated files back to the source tree:
@@ -44,6 +47,5 @@
 .src/Python/%.cpp-swig .src/Python/%.py-swig: %.i
        $(create_cpp)
-       mv -f $*.cpp .src/Python/$*.cpp-swig
-       cp -f $*.py .src/Python/$*.py-swig
+       mv -f $*.py .src/Python/$*.py-swig
 
 swig-update: $(patsubst %.i,.src/Python/%.cpp-swig,$(IFILES))



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates

Reply via email to