summaryrefslogtreecommitdiffstats
path: root/hwpfilter/Library_hwp.mk
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-21 13:11:39 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-21 13:11:39 +0200
commit03e6f1338cc18d047582fdb22787ebf0f693d8a2 (patch)
tree996e9ed75cc2eab711bdf32eecdc5c140efd6e22 /hwpfilter/Library_hwp.mk
parentgnumake4: switching gbuildization (diff)
downloadcore-03e6f1338cc18d047582fdb22787ebf0f693d8a2.tar.gz
core-03e6f1338cc18d047582fdb22787ebf0f693d8a2.zip
gnumake4: postmerge fixes in hwp
Diffstat (limited to 'hwpfilter/Library_hwp.mk')
-rw-r--r--hwpfilter/Library_hwp.mk14
1 files changed, 1 insertions, 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)