From 7398ef88b78d04b1428ed6336325a89f55117841 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sat, 10 Oct 2009 15:28:33 +0000
Subject: further refinements to build

git-svn-id: svn+q:///qpdf/trunk@759 71b93d88-0707-0410-a8cf-f5a4172ac649
---
 make/gcc-linux.mk | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'make/gcc-linux.mk')

diff --git a/make/gcc-linux.mk b/make/gcc-linux.mk
index 41978402..d773de4e 100644
--- a/make/gcc-linux.mk
+++ b/make/gcc-linux.mk
@@ -5,7 +5,7 @@ LOBJ=o
 
 # Usage: $(call libname,base)
 define libname
-lib$(1).a lib$(1).so
+lib$(1).so
 endef
 
 # Usage: $(call binname,base)
@@ -41,22 +41,25 @@ define libcompile
 endef
 
 
+#                        1    2
+# Usage: $(call makeslib,objs,library)
+define makeslib
+	$(RM) $2
+	ar cru $(2) $(1)
+	ranlib $(2)
+endef
+
 #                       1    2       3       4        5
 # Usage: $(call makelib,objs,library,current,revision,age)
 define makelib
 	$(RM) $2
-	if [ "$(findstring .a,$(2))" = ".a" ]; then \
-		ar cru $(2) $(1); \
-		ranlib $(2); \
-	else \
-		major=$$(( $(3) - $(5))); \
-	  	versuffix=$$major.$5.$4; \
-		$(CXX) $(CXXFLAGS) -shared -o $(2).$$versuffix $(1) \
-			-Wl,--soname -Wl,`basename $(2)`.$$major \
-			$(LDFLAGS) $(LIBS); \
-		ln -s `basename $(2)`.$$versuffix $(2); \
-		ln -s `basename $(2)`.$$versuffix $(2).$$major; \
-	fi
+	major=$$(( $(3) - $(5))); \
+	versuffix=$$major.$5.$4; \
+	$(CXX) $(CXXFLAGS) -shared -o $(2).$$versuffix $(1) \
+		-Wl,--soname -Wl,`basename $(2)`.$$major \
+		$(LDFLAGS) $(LIBS); \
+	ln -s `basename $(2)`.$$versuffix $(2); \
+	ln -s `basename $(2)`.$$versuffix $(2).$$major
 endef
 
 #                       1    2
-- 
cgit v1.2.3-54-g00ecf