Update of /cvsroot/mahogany/M/src/Python
In directory sc8-pr-cvs1:/tmp/cvs-serv4618/src/Python

Modified Files:
        Names.mk 
Log Message:
fixed for USE_SWIG=1 case now after last change; hopefully it should work for both now

Index: Names.mk
===================================================================
RCS file: /cvsroot/mahogany/M/src/Python/Names.mk,v
retrieving revision 1.11
retrieving revision 1.12
diff -b -u -2 -r1.11 -r1.12
--- Names.mk    6 Jan 2004 01:03:53 -0000       1.11
+++ Names.mk    6 Jan 2004 01:26:22 -0000       1.12
@@ -18,5 +18,5 @@
 define M_COMPILE_SWIG
 $(CXX) -o $@ $(strip $(M_COMPILE_CXX)) $(@:.o=.cpp)
[EMAIL PROTECTED] -f $*.d && { sed -e "s,$(@:.o=.cpp),$<," $*.d >$*.d2 && rm -f $*.d 
&& mv $*.d2 $*.d; }
[EMAIL PROTECTED] -f $(@:.o=.d) && { sed -e "s,$(@:.o=.cpp),$<," $(@:.o=.d) 
>$(@:.o=.d)2 && rm -f $(@:.o=.d) && mv $(@:.o=.d)2 $(@:.o=.d); }
 @rm -f $(@:.o=.cpp)
 endef
@@ -35,6 +35,6 @@
 define create_cpp
        $(SWIG) -I$(IFACE_DIR) $(CPPFLAGS) $(SWIGFLAGS) \
-        $(if $(subst swiglib,,$*),-c) -o $*.cpp $< && \
-       sed -e 's/Python\.h/MPython.h/' $*.cpp > $*.cpp.new && mv $*.cpp.new $*.cpp
+        $(if $(subst swiglib,,$*),-c) -o $(@:.o=.cpp) $< && \
+       sed -e 's/Python\.h/MPython.h/' $(@:.o=.cpp) > $(@:.o=.cpp).new && mv 
$(@:.o=.cpp).new $(@:.o=.cpp)
 endef
 
@@ -42,5 +42,5 @@
 vpath %.i $(IFACE_DIR)
 Python/%.o Python/%.py: %.i
-       cd Python && $(create_cpp)
+       $(create_cpp)
        $(M_COMPILE_SWIG)
 



-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates

Reply via email to