r1899 - trunk/antlr/debian

[Michael Koch]

Author: mkoch
Date: 2006-02-11 10:00:56 +0000 (Sat, 11 Feb 2006)
New Revision: 1899

Modified:
   trunk/antlr/debian/changelog
   trunk/antlr/debian/libantlr-dev.dirs
   trunk/antlr/debian/rules
Log:
* Provide static library compile with PIC (Closes: #351618).
* Updated config.guess and config.sub (Closes: #352203).


Modified: trunk/antlr/debian/changelog
===================================================================
--- trunk/antlr/debian/changelog	2006-02-09 22:16:53 UTC (rev 1898)
+++ trunk/antlr/debian/changelog	2006-02-11 10:00:56 UTC (rev 1899)
@@ -1,3 +1,10 @@
+antlr (2.7.6-3) unstable; urgency=low
+
+  * Provide static library compile with PIC (Closes: #351618).
+  * Updated config.guess and config.sub (Closes: #352203).
+
+ -- Michael Koch <konqueror at gmx.de>  Sat, 11 Feb 2006 10:29:56 +0000
+
 antlr (2.7.6-2) unstable; urgency=low
 
   * Added Build-Depends on python.

Modified: trunk/antlr/debian/libantlr-dev.dirs
===================================================================
--- trunk/antlr/debian/libantlr-dev.dirs	2006-02-09 22:16:53 UTC (rev 1898)
+++ trunk/antlr/debian/libantlr-dev.dirs	2006-02-11 10:00:56 UTC (rev 1899)
@@ -1 +1,2 @@
 usr/bin
+usr/lib

Modified: trunk/antlr/debian/rules
===================================================================
--- trunk/antlr/debian/rules	2006-02-09 22:16:53 UTC (rev 1898)
+++ trunk/antlr/debian/rules	2006-02-11 10:00:56 UTC (rev 1899)
@@ -26,7 +26,10 @@
 build-stamp:
 	dh_testdir
 	$(MAKE) -f debian/Makefile.debian make_with_gcj
-	cd lib/cpp; $(MAKE)
+	$(MAKE) -C lib/cpp CXXFLAGS="+ -fPIC -DPIC"
+	mv -f lib/cpp/src/libantlr.a debian/libantlr-pic.a
+	$(MAKE) -C lib/cpp clean
+	$(MAKE) -C lib/cpp
 	touch build-stamp
 
 clean:
@@ -43,6 +46,7 @@
 	-rm -f scripts/*.sh
 	-rm -f scripts/antlr-config scripts/config.deps scripts/antlr.spec scripts/config.make scripts/config.vars 
 	-rm -f antlr/Version.java
+	-rm -f debian/libantlr-pic.a
 	dh_clean
 
 install-indep: build-indep
@@ -59,7 +63,8 @@
 	dh_installdirs
 	install -m755 lib/python/antlr/antlr.py debian/antlr/usr/lib/python2.3/site-packages
 	install -m755 lib/python/antlr/antlr.py debian/antlr/usr/lib/python2.4/site-packages
-	( cd lib/cpp && $(MAKE) install prefix=`pwd`/../../debian/libantlr-dev/usr )
+	$(MAKE) -C lib/cpp install prefix=`pwd`/../../debian/libantlr-dev/usr
+	mv -f debian/libantlr-pic.a debian/libantlr-dev/usr/lib/
 	install -m755 scripts/antlr-config debian/libantlr-dev/usr/bin
 	install -m755 cantlr debian/cantlr/usr/bin