From bc91aa29453b6bbb822f2bfb39bae88b1db41a31 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sun, 8 Aug 2010 22:13:24 +0000
Subject: tweak shared library creation

git-svn-id: svn+q:///qpdf/trunk@1007 71b93d88-0707-0410-a8cf-f5a4172ac649
---
 make/gcc-linux.mk |  6 +++---
 make/mingw.mk     |  6 +++---
 make/msvc.mk      | 16 ++++++++--------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/make/gcc-linux.mk b/make/gcc-linux.mk
index 50b7dd0f..d34ecf04 100644
--- a/make/gcc-linux.mk
+++ b/make/gcc-linux.mk
@@ -66,12 +66,12 @@ endef
 # Usage: $(call makelib,objs,library,ldflags,libs,current,revision,age)
 define makelib
 	$(RM) $(2) $(2).*
-	major=$$(( $(5) - $(7))); \
+	major=$$(( $(5) - $(7) )); \
 	versuffix=$$major.$(7).$(6); \
 	$(CXX) $(CXXFLAGS) -shared -o $(2).$$versuffix $(1) \
 		-Wl,--soname -Wl,`basename $(2)`.$$major \
-		$(3) $(4); \
-	ln -s `basename $(2)`.$$versuffix $(2); \
+		$(3) $(4) && \
+	ln -s `basename $(2)`.$$versuffix $(2) && \
 	ln -s `basename $(2)`.$$versuffix $(2).$$major
 endef
 
diff --git a/make/mingw.mk b/make/mingw.mk
index 2ecc578d..9ee66aa0 100644
--- a/make/mingw.mk
+++ b/make/mingw.mk
@@ -62,9 +62,9 @@ endef
 #                       1    2       3       4    5       6        7
 # Usage: $(call makelib,objs,library,ldflags,libs,current,revision,age)
 define makelib
-	major=$$(( $(5) - $(7))); \
-	dlltool -l $(2) -D $$(basename `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(major).dll) $(1); \
-	$(CXX) -shared -o `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(major).dll \
+	major=$$(( $(5) - $(7) )); \
+	dlltool -l $(2) -D $$(basename `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`)$${major}.dll $(1) && \
+	$(CXX) -shared -o `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$${major}.dll \
 		$(1) $(3) $(4)
 endef
 
diff --git a/make/msvc.mk b/make/msvc.mk
index 481566c0..700d2aa8 100644
--- a/make/msvc.mk
+++ b/make/msvc.mk
@@ -65,16 +65,16 @@ endef
 #                       1    2       3       4    5       6        7
 # Usage: $(call makelib,objs,library,ldflags,libs,current,revision,age)
 define makelib
-	major=$$(( $(5) - $(7))); \
-	cl /nologo /O2 /Zi /Gy /EHsc /MD /LD /Fe$(basename $(2))$(major).dll \
+	major=$$(( $(5) - $(7) )); \
+	cl /nologo /O2 /Zi /Gy /EHsc /MD /LD /Fe$(basename $(2))$${major}.dll \
 		$(1) /link /incremental:no \
 		$(foreach L,$(subst -L,,$(3)),/LIBPATH:$(L)) \
-		$(foreach L,$(subst -l,,$(4)),$(L).lib)
-	if [ -f $(basename $(2))$(major).dll.manifest ]; then \
-		mt.exe -nologo -manifest $(basename $(2))$(major).dll.manifest \
-			-outputresource:$(basename $(2))$(major).dll\;2; \
-	fi
-	mv $(basename $(2))$(major).lib $(2)
+		$(foreach L,$(subst -l,,$(4)),$(L).lib) && \
+	if [ -f $(basename $(2))$${major}.dll.manifest ]; then \
+		mt.exe -nologo -manifest $(basename $(2))$${major}.dll.manifest \
+			-outputresource:$(basename $(2))$${major}.dll\;2; \
+	fi && \
+	mv $(basename $(2))$${major}.lib $(2)
 endef
 
 #                       1    2      3       4
-- 
cgit v1.2.3-54-g00ecf