diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-21 13:11:39 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-21 13:11:39 +0200 |
| commit | 6df18646dd33ba543c71ca0cffc13a5b66b26905 (patch) | |
| tree | 694b98666c590781df27511a9825d2a4da9dd6db | |
| parent | aba22372234deefa63ad1e64271d6e7ba8535f2f (diff) | |
gnumake4: postmerge fixes in hwpfeature/gnumake4_writerfilter_head
| -rw-r--r-- | hwpfilter/Library_hwp.mk | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk index 321d4bee4..87fef9fa6 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) |