[Pkg-voip-commits] r2945 - pwlib/trunk/debian

[Kilian Krause]

Author: kilian
Date: 2007-01-04 22:07:20 +0100 (Thu, 04 Jan 2007)
New Revision: 2945

Modified:
   pwlib/trunk/debian/rules
Log:
cleanup rules to build "both" in one step. Since changing the names this will work as intended.


Modified: pwlib/trunk/debian/rules
===================================================================
--- pwlib/trunk/debian/rules	2007-01-04 18:24:26 UTC (rev 2944)
+++ pwlib/trunk/debian/rules	2007-01-04 21:07:20 UTC (rev 2945)
@@ -72,25 +72,20 @@
 	touch autotools
 	
 build-arch-stamp:
-	# first build static so that we do get proper static linking
-	$(MAKE) PWLIBDIR=$(CURDIR) bothnoshared
-	# ensure we do a fresh check with hello world.
+	# first build static and shared...
+	$(MAKE) PWLIBDIR=$(CURDIR) both
+	# then we ensure that the fresh build works with hello world.
+	# ...in static
 	-$(MAKE) PWLIBDIR=$(CURDIR) -C samples/hello_world/ clean
 	-$(RM) -rf samples/hello_world/obj_*
 	$(MAKE) PWLIBDIR=$(CURDIR) -C samples/hello_world/ bothnoshared
-	# try if our build actually works ...
 	samples/hello_world/obj_*_d/hello
 	samples/hello_world/obj_*_r/hello
 	
-	# secondly we need to cleanup and rebuild shared to ensure we get PIC code
-	$(MAKE) PWLIBDIR=$(CURDIR) clean
-	$(MAKE) PWLIBDIR=$(CURDIR) bothshared
-	# ensure we do a fresh check with hello world.
+	# ...and in shared..
 	$(MAKE) PWLIBDIR=$(CURDIR) -C samples/hello_world/ clean
 	-$(RM) -rf samples/hello_world/obj_*
-	# and now build shared aswell
 	$(MAKE) PWLIBDIR=$(CURDIR) -C samples/hello_world/ bothshared
-	# try if our build actually works ...
 	if (samples/hello_world/obj_*_d/hello 2>/dev/null);then \
 		echo debug hello_world sample incorrectly compiled static; false ; \
 	else \