git » fp-git.git » commit ec036ff

moved python module to its own directory

author ecalot
2005-03-26 14:15:32 UTC
committer ecalot
2005-03-26 14:15:32 UTC
parent 7a9fd75e57572944900b2266a32115e3bdb8c5d6

moved python module to its own directory

PR/src/Makefile +7 -6

diff --git a/PR/src/Makefile b/PR/src/Makefile
index eae7e3b..d5dcd9b 100644
--- a/PR/src/Makefile
+++ b/PR/src/Makefile
@@ -64,6 +64,8 @@ LIBOBJ   = $(FILES) $(XML) $(COMPRESS) $(PORTS)
 EXEFILE  = bin/pr
 XMLFILE  = bin/resources.xml
 
+ADDONS   = python.o
+
 #Use this to temporary remove an option
 OPTIONS       = $(INCLUDE) $(DEFINES) $(RELEASE)
 LINKEROPTIONS = $(LINKERRELEASE)
@@ -84,7 +86,7 @@ $(EXEFILE): $(EXEOBJ)
 
 clean:
 	$(INFO) Erasing temporary object files...
-	$(REMOVER) $(EXEOBJ) $(EXEFILE)
+	$(REMOVER) $(EXEOBJ) $(EXEFILE) $(ADDONS)
 
 cleanxml:
 	$(INFO) Erasing xml file...
@@ -211,13 +213,12 @@ getopt1.o: ports/getopt1.c
 	$(CC) $(OPTIONS) -c ports/getopt1.c
 
 #python
-python.o: addons/python.c
+python.o: addons/python/python.c
 	$(INFO) Building the python interfaces
-	$(CC) -pthread -fno-strict-aliasing -DNDEBUG -g -O3 -Wall -fPIC -I/usr/include/python2.3 -c addons/python.c $(INCLUDE)
+	$(CC) -pthread -fno-strict-aliasing -DNDEBUG -g -O3 -Wall -fPIC -I/usr/include/python2.3 -c addons/python/python.c $(INCLUDE)
 	
 pylib: python.o $(LIBOBJ)
 	$(INFO) Building the python module
-	$(MAKEDIR) addons/python
-	$(CC) -pthread -shared python.o $(LIBOBJ) -o addons/python/pr.so
-
+	$(MAKEDIR) addons/python/bin
+	$(CC) -pthread -shared python.o $(LIBOBJ) -o addons/python/bin/pr.so