diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-04 21:58:30 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-08 12:45:09 +0200 |
| commit | 345d0140104db238092b41af7360c538dfa576b3 (patch) | |
| tree | 71c89d3f36d8468b6a5db340d84a137e2e5e19ae /writerperfect | |
| parent | 2ecd5b0372e7953a57ece3c669c22e6545e19f2e (diff) | |
writerperfect: simplify these conditions
Change-Id: Ibed9d8963c102001cbfb259965e156179f05d5c4
Diffstat (limited to 'writerperfect')
| -rw-r--r-- | writerperfect/Module_writerperfect.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk index 158b01402320..921e7e8b0b13 100644 --- a/writerperfect/Module_writerperfect.mk +++ b/writerperfect/Module_writerperfect.mk @@ -19,19 +19,19 @@ $(eval $(call gb_Module_Module,writerperfect)) -ifneq (,$(filter YES,$(SYSTEM_LIBWPD))$(filter LIBWPD,$(BUILD_TYPE))) -ifneq (,$(filter YES,$(SYSTEM_LIBWPS))$(filter LIBWPS,$(BUILD_TYPE))) +ifneq (,$(SYSTEM_LIBWPD)) +ifneq (,$(SYSTEM_LIBWPS)) $(eval $(call gb_Module_add_targets,writerperfect,\ Library_wpftwriter \ )) endif endif -ifneq (,$(filter YES,$(SYSTEM_LIBWPD))$(filter LIBWPD,$(BUILD_TYPE))) -ifneq (,$(filter YES,$(SYSTEM_LIBWPG))$(filter LIBWPG,$(BUILD_TYPE))) -ifneq (,$(filter YES,$(SYSTEM_LIBVISIO))$(filter LIBVISIO,$(BUILD_TYPE))) -ifneq (,$(filter YES,$(SYSTEM_LIBCDR))$(filter LIBCDR,$(BUILD_TYPE))) -ifneq (,$(filter YES,$(SYSTEM_LIBMSPUB))$(filter LIBMSPUB,$(BUILD_TYPE))) +ifneq (,$(SYSTEM_LIBWPD)) +ifneq (,$(SYSTEM_LIBWPG)) +ifneq (,$(SYSTEM_LIBVISIO)) +ifneq (,$(SYSTEM_LIBCDR)) +ifneq (,$(SYSTEM_LIBMSPUB)) $(eval $(call gb_Module_add_targets,writerperfect,\ Library_wpftdraw \ )) @@ -41,8 +41,8 @@ endif endif endif -ifneq (,$(filter YES,$(SYSTEM_LIBWPD))$(filter LIBWPD,$(BUILD_TYPE))) -ifneq (,$(filter YES,$(SYSTEM_LIBWPG))$(filter LIBWPG,$(BUILD_TYPE))) +ifneq (,$(SYSTEM_LIBWPD)) +ifneq (,$(SYSTEM_LIBWPG)) $(eval $(call gb_Module_add_targets,writerperfect,\ StaticLibrary_writerperfect \ )) |