From 03e6f1338cc18d047582fdb22787ebf0f693d8a2 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 21 Jun 2011 13:11:39 +0200 Subject: [PATCH] gnumake4: postmerge fixes in hwp --- hwpfilter/Library_hwp.mk | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk index 321d4bee411d..87fef9fa66de 100644 --- a/hwpfilter/Library_hwp.mk +++ b/hwpfilter/Library_hwp.mk @@ -43,19 +43,7 @@ $(eval $(call gb_Library_add_linked_libs,hwp,\ $(gb_STDLIBS) \ )) -ifeq ($(SYSTEM_ZLIB),YES) -$(eval $(call gb_Library_set_cxxflags,hwp,\ - $$(CXXFLAGS) \ - -DSYSTEM_ZLIB \ -)) -$(eval $(call gb_Library_add_linked_libs,hwp,\ - z \ -)) -else -$(eval $(call gb_Library_add_linked_static_libs,hwp,\ - zlib \ -)) -endif +$(call gb_Library_use_external,hwp,zlib) ifeq ($(OS),WNT)