diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-10-05 22:30:21 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-05 22:30:21 +0200 |
| commit | e80f565c3886f8bc87b03d43acbb1453f7edcc48 (patch) | |
| tree | 2f40a27c7ac8112e3bbd0e828c1550a1aba5c65c /libcdr/ExternalProject_libcdr.mk | |
| parent | 2b7536a99839543cc535c1c60a019bd2f784a847 (diff) | |
libcdr: remove boilerplate:
Define the various FOO_CFLAGS/FOO_LIBS used by libcdr in configure even
for the case of internal FOO, and then just pass those variables into
libcdr configure to get rid of SYSTEM_FOO conditionals.
Change-Id: I0edabc13f8a068cb13792a16499593b8c589da1a
Diffstat (limited to 'libcdr/ExternalProject_libcdr.mk')
| -rw-r--r-- | libcdr/ExternalProject_libcdr.mk | 60 |
1 files changed, 8 insertions, 52 deletions
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index fe6ce5f6898e..eb48909484c7 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -33,61 +33,17 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : else -libcdr_cflags := -libcdr_libs := - -ifeq ($(SYSTEM_LIBWPD),YES) - -libcdr_cflags += $(WPD_CFLAGS) -libcdr_libs += $(WPD_LIBS) - -else # !SYSTEM_LIBWPD - -libcdr_cflags += -I$(OUTDIR)/inc/external -libcdr_libs += $(SOLARLIB) - -endif # SYSTEM_LIBWPD - - -ifeq ($(SYSTEM_LIBWPG),YES) - -libcdr_cflags += $(WPG_CFLAGS) -libcdr_libs += $(WPG_LIBS) - -else # !SYSTEM_LIBWPG - -libcdr_cflags += -I$(OUTDIR)/inc/external -libcdr_libs += $(SOLARLIB) - -endif # SYSTEM_LIBWPG - - -ifeq ($(SYSTEM_LCMS2),YES) - -else # !SYSTEM_LCMS2 - -libcdr_cflags += -I$(OUTDIR)/inc/lcms2 -libcdr_libs += $(SOLARLIB) - -endif # SYSTEM_LCMS2 - -zlib_cflags := -zlib_libs := - -ifneq ($(SYSTEM_ZLIB),YES) - -zlib_cflags += -I$(OUTDIR)/inc/external/zlib -zlib_libs += $(SOLARLIB) - -endif # !SYSTEM_ZLIB - $(call gb_ExternalProject_get_state_target,libcdr,build) : cd $(EXTERNAL_WORKDIR) \ && PKG_CONFIG="" \ - LIBCDR_CFLAGS="$(libcdr_cflags)" \ - LIBCDR_LIBS="$(libcdr_libs)" \ - ZLIB_CFLAGS="$(zlib_cflags)" \ - ZLIB_LIBS="$(zlib_libs)" \ + WPD_CFLAGS="$(WPD_CFLAGS)" \ + WPD_LIBS="$(WPD_LIBS)" \ + WPG_CFLAGS="$(WPG_CFLAGS)" \ + WPG_LIBS="$(WPG_LIBS)" \ + LCMS2_CFLAGS="$(LCMS2_CFLAGS)" \ + LCMS2_LIBS="$(LCMS2_LIBS)" \ + ZLIB_CFLAGS="$(ZLIB_CFLAGS)" \ + ZLIB_LIBS="$(ZLIB_LIBS)" \ ./configure \ --with-pic \ --enable-static \ |