diff options
| author | Ocke Janssen [oj] <Ocke.Janssen@oracle.com> | 2011-04-15 12:23:36 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 14:53:14 +0200 |
| commit | 6a91b70e1f5646f194044d14d9a1eaa8edb422d2 (patch) | |
| tree | 12500460c9d10f5a0ea293b5b65242dcd6d0041e /dbaccess/Library_dbui.mk | |
| parent | 2fa7e03614228e65b0c81cd6bc075b08aa42907b (diff) | |
gnumake4: fix to use new add rules [hg:76c825726ff2]
Diffstat (limited to 'dbaccess/Library_dbui.mk')
| -rw-r--r-- | dbaccess/Library_dbui.mk | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk index 2a60b20637a6..157dc277583c 100644 --- a/dbaccess/Library_dbui.mk +++ b/dbaccess/Library_dbui.mk @@ -41,17 +41,14 @@ $(eval $(call gb_Library_set_include,dbui,\ )) ifeq ($(SYSTEM_ODBC_HEADERS),TRUE) -$(eval $(call gb_Library_set_cflags,dbui,\ - $$(CFLAGS) \ - $$(OBJCFLAGS) \ +$(eval $(call gb_Library_add_cflags,dbui,\ -DSYSTEM_ODBC_HEADERS \ )) endif
ifneq ($(WINDOWS_VISTA_PSDK),)
ifeq ($(PROF_EDITION),)
-$(eval $(call gb_Library_set_defs,dbui,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,dbui,\ -DDBACCESS_DLLIMPLEMENTATION\ -DWINDOWS_VISTA_PSDK \ ))
@@ -59,7 +56,7 @@ endif endif
ifeq ($(GUI)$(COM),WNTGCC)
-$(eval $(call gb_Library_set_cflags,dbui,\ +$(eval $(call gb_Library_add_cflags,dbui,\ -fpermissive \ ))
endif @@ -78,8 +75,7 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\ endif endif -$(eval $(call gb_Library_set_defs,dbui,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,dbui,\ -DDBACCESS_DLLIMPLEMENTATION\ )) |