[Pntool-developers] SF.net SVN: pntool:[150]

[<com...@us...>]

Revision: 150
          http://pntool.svn.sourceforge.net/pntool/?rev=150&view=rev
Author:   compaqdrew
Date:     2009-07-02 19:04:13 +0000 (Thu, 02 Jul 2009)

Log Message:
-----------
I am an idiot.

Modified Paths:
--------------
    Makefile
    third-party/lp_solve_5.5/Makefile.Linux
    translator/Makefile

Modified: Makefile
===================================================================
--- Makefile	2009-07-02 00:11:54 UTC (rev 149)
+++ Makefile	2009-07-02 19:04:13 UTC (rev 150)
@@ -41,9 +41,13 @@
 
 clean:
 	rm -f main_function.o
+	rm -f ct
 	cd $(PNHEADERS); make clean
 	cd codegen; make clean
 	cd $(TRANSLATOR); make clean
+	cd $(SPNBOX); make clean
+	#My personal opinion is that this should be in spnbox's makefile
+	cd third-party/lp_solve_5.5; make -f Makefile.Linux clean
 
 distclean: clean
 	cd codegen; make distclean

Modified: third-party/lp_solve_5.5/Makefile.Linux
===================================================================
--- third-party/lp_solve_5.5/Makefile.Linux	2009-07-02 00:11:54 UTC (rev 149)
+++ third-party/lp_solve_5.5/Makefile.Linux	2009-07-02 19:04:13 UTC (rev 150)
@@ -53,7 +53,7 @@
 ifeq ("$(UNAME)", "Darwin") #there's no concept of an ".so" on a mac.  We use dylib for this.
 	LIBRARIES := liblpsolve55.a
 else
-	ADDL_ARGS := liblpsolve55.a liblpsolve55.so
+	LIBRARIES := liblpsolve55.a liblpsolve55.so
 endif
 
 BINARIES = lp_solve demo
@@ -87,7 +87,7 @@
 	ranlib lpsolve55/$@
 
 liblpsolve55.so: $(OBJECTS)
-	$(CC) -fpic -shared -Wl,$(ADDL_ARGS)$@ -o lpsolve55/$@ `echo $(SRC)|sed 's/[.]c/.o/g'` $(LDFLAGS)
+	$(CC) -fpic -shared -Wl,-Bsymbolic -Wl,-soname,$@ -o lpsolve55/$@ `echo $(SRC)|sed 's/[.]c/.o/g'` $(LDFLAGS)
 
 
 clean:

Modified: translator/Makefile
===================================================================
--- translator/Makefile	2009-07-02 00:11:54 UTC (rev 149)
+++ translator/Makefile	2009-07-02 19:04:13 UTC (rev 150)
@@ -40,6 +40,8 @@
 	rm *.java || true
 clean : cleanup
 	rm *.o *.orig *.rej || true
+	#this was left behind on OSX
+	rm -f libtranslator.a 
 
 distclean : clean
 	if test -e ../third-party/ANTLR3_ctarget_3_1_3/Makefile; then cd ../third-party/ANTLR3_ctarget_3_1_3/; make distclean; fi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.