[Fxpy-commits] FXPy/swig Makefile,1.31,1.32

[Bastian K. <ca...@us...>]

Update of /cvsroot/fxpy/FXPy/swig
In directory sc8-pr-cvs1:/tmp/cvs-serv31506

Modified Files:
	Makefile 
Log Message:
use some make macros

Index: Makefile
===================================================================
RCS file: /cvsroot/fxpy/FXPy/swig/Makefile,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Makefile	22 Feb 2003 00:31:08 -0000	1.31
+++ Makefile	22 Feb 2003 00:40:14 -0000	1.32
@@ -18,34 +18,25 @@
 INTERFACES =	fox.i fxdefs.i fox3d.i controls.i windows.i structs.i \
 		graphics.i mdi.i containers.i menus.i dialogs.i misc.i \
 		table.i treelist.i dirlist.i iconlist.i text.i
-
+SRCDIR = ../src
 # SWIG-generated wrapper files
-WRAPPERS =	../src/mdi.cpp ../src/fox.cpp ../src/fox3d.cpp ../src/mdi.cpp\
-		../src/controls.cpp ../src/menus.cpp ../src/dialogs.cpp\
-		../src/windows.cpp ../src/containers.cpp ../src/misc.cpp\
-		../src/graphics.cpp ../src/table.cpp ../src/treelist.cpp\
-		../src/dirlist.cpp ../src/iconlist.cpp ../src/text.cpp
-
+WRAPPERS = $(patsubst %.i, $(SRCDIR)/%.cpp, $(INTERFACES))
 # SWIG-generated shadow class modules
-MODULES =	../src/mdi.py ../src/fox.py ../src/fox3d.py ../src/mdi.py\
-		../src/controls.py ../src/menus.py ../src/dialogs.py\
-		../src/windows.py ../src/containers.py ../src/misc.py\
-		../src/graphics.py ../src/table.py ../src/treelist.py\
-		../src/dirlist.py ../src/iconlist.py ../src/text.py
+MODULES = $(patsubst %.i, $(SRCDIR)/%.py, $(INTERFACES))
 
 # Make a SWIG interface file from its template
 %.i: %.ii
-	python prep.py $< > $@
-	@python crlf.py $@
+	$(PYTHON)  prep.py $< > $@
+	@$(PYTHON)  crlf.py $@
 
 # Make a wrapper file from its interface file
 %.cpp:
 	$(SWIG) $(CFLAGS) -c -o $*.cpp $<
-	@python crlf.py $*.cpp $*.py
+	@$(PYTHON)  crlf.py $*.cpp $*.py
 
 # Make all wrappers & shadow class files
 all: $(WRAPPERS)
-	@cd ../src; python make_virtuals.py; python overloads.py; python ../swig/crlf.py *.py
+	@cd ../src; $(PYTHON) make_virtuals.py; $(PYTHON) overloads.py; $(PYTHON) ../swig/crlf.py *.py
 
 # will be automatically called when dependencies file is missing
 dependencies:
@@ -57,14 +48,14 @@
 	$(SWIG) $(CFLAGS) -c -o $*.cpp $<
 	@sed -e "s/FXchar \*\* _arg1/const FXchar \*\* _arg1/g" ../src/dialogs.cpp > junk
 	@mv junk ../src/dialogs.cpp
-	@python crlf.py $*.cpp $*.py
+	@$(PYTHON)  crlf.py $*.cpp $*.py
 
 # Miscellaneous (same SWIG bug workaround)
 ../src/misc.cpp: misc.i
 	$(SWIG) $(CFLAGS) -c -o $*.cpp $<
 	@sed -e "s/FXchar \*\*/const FXchar \*\*/g" ../src/misc.cpp > junk
 	@mv junk ../src/misc.cpp
-	@python crlf.py $*.cpp $*.py
+	@$(PYTHON)  crlf.py $*.cpp $*.py
 
 clean:
-	@rm -rf $(WRAPPERS) $(MODULES) $(INTERFACES)
+	rm -f $(WRAPPERS) $(MODULES) $(INTERFACES)