From 2b5ac676ed1cbde1092d41acf0775b1c8d9a2baf Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sun, 11 Oct 2009 00:24:22 +0000
Subject: generalize build

git-svn-id: svn+q:///qpdf/trunk@776 71b93d88-0707-0410-a8cf-f5a4172ac649
---
 make/mingw.mk | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'make/mingw.mk')

diff --git a/make/mingw.mk b/make/mingw.mk
index f0442c96..ae599393 100644
--- a/make/mingw.mk
+++ b/make/mingw.mk
@@ -44,17 +44,16 @@ define makeslib
 	$(RANLIB) $(2)
 endef
 
-#                       1    2       3       4        5
-# Usage: $(call makelib,objs,library,current,revision,age)
+#                       1    2       3       4    5       6        7
+# Usage: $(call makelib,objs,library,ldflags,libs,current,revision,age)
 define makelib
-	dlltool -l $(2) -D $$(basename `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(3).dll) $(1); \
-	$(CXX) -shared -o `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(3).dll \
-		$(1) $(LDFLAGS) $(LIBS)
+	dlltool -l $(2) -D $$(basename `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(5).dll) $(1); \
+	$(CXX) -shared -o `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(5).dll \
+		$(1) $(3) $(4)
 endef
 
-#                       1    2
-# Usage: $(call makebin,objs,binary)
+#                       1    2      3       4
+# Usage: $(call makebin,objs,binary,ldflags,libs)
 define makebin
-	$(CXX) $(CXXFLAGS) $(1) -o $(2) $(LDFLAGS) \
-		-Llibqpdf/$(OUTPUT_DIR) -lqpdf $(LIBS)
+	$(CXX) $(CXXFLAGS) $(1) -o $(2) $(3) $(4)
 endef
-- 
cgit v1.2.3-70-g09d2