From 8491773b116114020c2d08d368eea68bd46f1831 Mon Sep 17 00:00:00 2001
From: frankmorgner <frankmorgner@96b47cad-a561-4643-ad3b-153ac7d7599c>
Date: Sat, 5 Nov 2011 13:39:31 +0000
Subject: [PATCH] added fixes for la files

git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@622 96b47cad-a561-4643-ad3b-153ac7d7599c
---
 npa/Makefile.am | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/npa/Makefile.am b/npa/Makefile.am
index 119b07f..600fb19 100644
--- a/npa/Makefile.am
+++ b/npa/Makefile.am
@@ -15,12 +15,23 @@ do_subst = sed \
 	   -e 's,[@]OPENSC_LIBS[@],$(OPENSC_LIBS),g' \
 	   -e 's,[@]top_srcdir[@],$(top_srcdir),g'
 
-do_export = sed -e 's,-export-symbols "[$$](srcdir)/libopensc.exports",,g' \
-			-e 's,libopensc.exports,,g' \
-		   	< src/libopensc/Makefile.am \
-			> src/libopensc/Makefile.am
+#do_export = sed -e 's,-export-symbols "[$$](srcdir)/libopensc.exports",,g' \
+			#-e 's,libopensc.exports,,g' \
+		   	#< src/libopensc/Makefile.am \
+			#> src/libopensc/Makefile.am
 do_export = cp $(shell pwd)/Makefile.am.opensc src/libopensc/Makefile.am
 
+fixup_la = find "$(srcdir)/src/opensc/win32/build/image" -name '*.la' | while read f; do \
+		   top="$$(dirname "$$(dirname "$$(echo "$${f}")")" | sed 's\#//\#/\#g')" \
+		   sed 's\#//\#'"$${top}"'/\#g' "$${f}" > "$${f}.tmp"; \
+		   mv "$${f}.tmp" "$${f}"; \
+		   done
+restore_la = find "$(srcdir)/src/opensc/win32/build/image" -name '*.la' | while read f; do \
+			 x="$$(echo "$(srcdir)/src/opensc/win32/build/image" | sed 's\#/$$\#\#')" \
+			 sed 's\#'"$${x}"'/[^/]*/lib\#//lib\#g' "$${f}" > "$${f}.tmp"; \
+			 mv "$${f}.tmp" "$${f}"; \
+			 done
+
 win-opensc:
 	cd $(top_srcdir)/src/opensc && \
 		./bootstrap && \
@@ -28,6 +39,7 @@ win-opensc:
 		EXTRA_OPENSC_CONFIG="`$(do_export)`" OPENSSL_VERSION="1.0.0e" OPENSSL_URL="https://www2.informatik.hu-berlin.de/~morgner/files/openssl-1.0.0e.tar.gz" EXTRA_OPENSSL_CONFIG="experimental-pace" win32/installer_from_build.sh
 
 win:
+	$(fixup_la)
 	./configure \
 		--sbindir=/bin \
 		--prefix=/ \
@@ -35,9 +47,10 @@ win:
 		--build=i686-pc-linux-gnu \
 		--program-prefix='' \
 		OPENSSL_CFLAGS="-I$(srcdir)/src/opensc/win32/build/image/opensc/include" \
-		OPENSSL_LIBS="$(srcdir)/src/opensc/win32/build/image/opensc/lib/libcrypto.dll.a -lws2_32 -lgdi32 -lcrypt32" \
-		OPENSC_LIBS="$(srcdir)/src/opensc/win32/build/image/opensc/lib/libopensc.dll.a"
+		OPENSSL_LIBS="-L$(srcdir)/src/opensc/win32/build/image/opensc/lib -lcrypto -lws2_32 -lgdi32 -lcrypt32" \
+		OPENSC_LIBS="-L$(srcdir)/src/opensc/win32/build/image/opensc/lib -lopensc"
 	make install DESTDIR=$(srcdir)/src/opensc/win32/build/image/opensc
+	$(restore_la)
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libnpa.pc