diff options
| -rw-r--r-- | codemaker/Executable_cppumaker.mk | 5 | ||||
| -rw-r--r-- | codemaker/Executable_javamaker.mk | 5 | ||||
| -rw-r--r-- | codemaker/StaticLibrary_codemaker.mk | 6 | ||||
| -rw-r--r-- | codemaker/StaticLibrary_codemaker_cpp.mk | 5 | ||||
| -rw-r--r-- | codemaker/StaticLibrary_codemaker_java.mk | 5 |
5 files changed, 5 insertions, 21 deletions
diff --git a/codemaker/Executable_cppumaker.mk b/codemaker/Executable_cppumaker.mk index 69293e2c424b..e3ab77df4c85 100644 --- a/codemaker/Executable_cppumaker.mk +++ b/codemaker/Executable_cppumaker.mk @@ -26,11 +26,6 @@ $(eval $(call gb_Executable_Executable,cppumaker)) -$(eval $(call gb_Executable_set_include,cppumaker,\ - -I$(SRCDIR)/codemaker/inc \ - $$(INCLUDE) \ -)) - $(eval $(call gb_Executable_use_libraries,cppumaker,\ reg \ sal \ diff --git a/codemaker/Executable_javamaker.mk b/codemaker/Executable_javamaker.mk index cd5a1aaf67ce..2997e37f080d 100644 --- a/codemaker/Executable_javamaker.mk +++ b/codemaker/Executable_javamaker.mk @@ -26,11 +26,6 @@ $(eval $(call gb_Executable_Executable,javamaker)) -$(eval $(call gb_Executable_set_include,javamaker,\ - -I$(SRCDIR)/codemaker/inc \ - $$(INCLUDE) \ -)) - $(eval $(call gb_Executable_use_libraries,javamaker,\ reg \ sal \ diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk index c55209fbbaf0..bbea555a5d18 100644 --- a/codemaker/StaticLibrary_codemaker.mk +++ b/codemaker/StaticLibrary_codemaker.mk @@ -28,14 +28,10 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker)) $(eval $(call gb_StaticLibrary_use_packages,codemaker,\ + codemaker_inc \ sal_generated \ )) -$(eval $(call gb_StaticLibrary_set_include,codemaker,\ - -I$(SRCDIR)/codemaker/inc \ - $$(INCLUDE) \ -)) - $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker,\ codemaker/source/codemaker/dependencies \ codemaker/source/codemaker/exceptiontree \ diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk index 3f1811434e44..b8cabf468a88 100644 --- a/codemaker/StaticLibrary_codemaker_cpp.mk +++ b/codemaker/StaticLibrary_codemaker_cpp.mk @@ -27,9 +27,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_cpp)) -$(eval $(call gb_StaticLibrary_set_include,codemaker_cpp,\ - -I$(SRCDIR)/codemaker/inc \ - $$(INCLUDE) \ +$(eval $(call gb_StaticLibrary_use_packages,codemaker_cpp,\ + codemaker_inc \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_cpp,\ diff --git a/codemaker/StaticLibrary_codemaker_java.mk b/codemaker/StaticLibrary_codemaker_java.mk index b9e23969dba1..6538e380496a 100644 --- a/codemaker/StaticLibrary_codemaker_java.mk +++ b/codemaker/StaticLibrary_codemaker_java.mk @@ -27,9 +27,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_java)) -$(eval $(call gb_StaticLibrary_set_include,codemaker_java,\ - -I$(SRCDIR)/codemaker/inc \ - $$(INCLUDE) \ +$(eval $(call gb_StaticLibrary_use_packages,codemaker_java,\ + codemaker_inc \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_java,\ |