diff options
| -rw-r--r-- | odk/CustomTarget_doxygen.mk | 2 | ||||
| -rw-r--r-- | salhelper/CustomTarget_salhelper_allheaders.mk | 6 | ||||
| -rw-r--r-- | salhelper/Library_salhelper.mk | 2 | ||||
| -rw-r--r-- | salhelper/Module_salhelper.mk | 2 | ||||
| -rw-r--r-- | salhelper/ZipPackage_salhelper_odk_headers.mk (renamed from salhelper/Package_inc.mk) | 22 |
5 files changed, 19 insertions, 15 deletions
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk index 5e472f2fef52..528cbbbecaea 100644 --- a/odk/CustomTarget_doxygen.mk +++ b/odk/CustomTarget_doxygen.mk @@ -21,7 +21,7 @@ DOXY_STRIP_PATH := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(OUTDIR)/inc),$( DOXY_DEPS := $(SRCDIR)/odk/pack/gendocu/Doxyfile \ $(SRCDIR)/odk/pack/gendocu/main.dox \ $(call gb_Package_get_target,sal_odk_headers) \ - $(call gb_Package_get_target,salhelper_inc) \ + $(call gb_Package_get_target,salhelper_odk_headers) \ $(call gb_Package_get_target,cppu_inc) \ $(call gb_Package_get_target,cppuhelper_inc) \ $(call gb_Package_get_target,store_inc) \ diff --git a/salhelper/CustomTarget_salhelper_allheaders.mk b/salhelper/CustomTarget_salhelper_allheaders.mk index 2ec5a62229cd..60498aab3da0 100644 --- a/salhelper/CustomTarget_salhelper_allheaders.mk +++ b/salhelper/CustomTarget_salhelper_allheaders.mk @@ -32,10 +32,12 @@ salhelper_allheaders_DIR := $(call gb_CustomTarget_get_workdir,salhelper/allhead $(call gb_CustomTarget_get_target,salhelper/allheaders) : \ $(salhelper_allheaders_DIR)/salhelper_allheaders.hxx -# dependency on Package_inc.mk should ensure this is updated whenever a new public header is added +# dependency on Package_salhelper_odk_headers.mk should ensure this is +# updated whenever a new public header is added $(salhelper_allheaders_DIR)/salhelper_allheaders.hxx : \ $(SRCDIR)/salhelper/CustomTarget_salhelper_allheaders.mk \ - | $(salhelper_allheaders_DIR)/.dir $(SRCDIR)/salhelper/Package_inc.mk + $(SRCDIR)/salhelper/ZipPackage_salhelper_odk_headers.mk \ + | $(salhelper_allheaders_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) printf '// Generated list of all salhelper/ includes\n' > $@ $(foreach file, $(wildcard $(SRCDIR)/salhelper/inc/*.h) $(wildcard $(SRCDIR)/salhelper/inc/*.hxx) \ diff --git a/salhelper/Library_salhelper.mk b/salhelper/Library_salhelper.mk index 7c66678cbf4d..26c90dcd81c6 100644 --- a/salhelper/Library_salhelper.mk +++ b/salhelper/Library_salhelper.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,salhelper)) -$(eval $(call gb_Library_use_package,salhelper,salhelper_inc)) +$(eval $(call gb_Library_use_package,salhelper,salhelper_odk_headers)) $(eval $(call gb_Library_add_defs,salhelper,\ -DSALHELPER_DLLIMPLEMENTATION \ diff --git a/salhelper/Module_salhelper.mk b/salhelper/Module_salhelper.mk index 699fbed11eec..31f3f22feff2 100644 --- a/salhelper/Module_salhelper.mk +++ b/salhelper/Module_salhelper.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Module_Module,salhelper)) $(eval $(call gb_Module_add_targets,salhelper,\ CustomTarget_salhelper_allheaders \ Library_salhelper \ - Package_inc \ + ZipPackage_salhelper_odk_headers \ )) $(eval $(call gb_Module_add_check_targets,salhelper,\ diff --git a/salhelper/Package_inc.mk b/salhelper/ZipPackage_salhelper_odk_headers.mk index 7a30c7fc967d..8de4d5ffc1a7 100644 --- a/salhelper/Package_inc.mk +++ b/salhelper/ZipPackage_salhelper_odk_headers.mk @@ -25,16 +25,18 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_Package_Package,salhelper_inc,$(SRCDIR)/salhelper/inc/salhelper)) +$(eval $(call gb_ZipPackage_ZipPackage,salhelper_odk_headers,$(SRCDIR)/salhelper/inc/salhelper)) -$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/salhelperdllapi.h,salhelperdllapi.h)) -$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/condition.hxx,condition.hxx)) -$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/dynload.hxx,dynload.hxx)) -$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/linkhelper.hxx,linkhelper.hxx)) -$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/refobj.hxx,refobj.hxx)) -$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/simplereferenceobject.hxx,simplereferenceobject.hxx)) -$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/singletonref.hxx,singletonref.hxx)) -$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/thread.hxx,thread.hxx)) -$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/timer.hxx,timer.hxx)) +$(eval $(call gb_ZipPackage_add_files,salhelper_odk_headers,inc/salhelper,include/salhelper,\ + salhelperdllapi.h \ + condition.hxx \ + dynload.hxx \ + linkhelper.hxx \ + refobj.hxx \ + simplereferenceobject.hxx \ + singletonref.hxx \ + thread.hxx \ + timer.hxx \ +)) # vim: set noet sw=4 ts=4: |