diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-02-27 01:29:42 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-02-27 01:33:19 +0100 |
| commit | 9b16031c5e3197bf685703bf236e53b5910b4f70 (patch) | |
| tree | a109a2bd13be4115fd0fac2563a1633c08c924b4 /odk | |
| parent | 5c60cebafdc6d6d773c794c0a4ee58d63782df22 (diff) | |
odk, scp2: remove the horribly broken "find" in CustomTarget_include
... and instead bundle the *_odk_headers zip files.
Change-Id: Ice86f8e22d3a6fa46f7cee38193dffdd0479d491
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/CustomTarget_doxygen.mk | 13 | ||||
| -rw-r--r-- | odk/CustomTarget_include.mk | 27 |
2 files changed, 13 insertions, 27 deletions
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk index cde87c4baa55..2a18fbf90e80 100644 --- a/odk/CustomTarget_doxygen.mk +++ b/odk/CustomTarget_doxygen.mk @@ -13,6 +13,19 @@ odkcommon_ZIPLIST += docs/cpp/ref CPPDOCREFNAME := "UDK $(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO) C/C++ API Reference" +odk_INCDIRLIST := sal salhelper rtl osl store typelib uno cppu cppuhelper \ + registry $(if $(filter WNT,$(OS)),systools) +odk_INCFILELIST := com/sun/star/uno/Any.h \ + com/sun/star/uno/Any.hxx \ + com/sun/star/uno/genfunc.h \ + com/sun/star/uno/genfunc.hxx \ + com/sun/star/uno/Reference.h \ + com/sun/star/uno/Reference.hxx \ + com/sun/star/uno/Sequence.h \ + com/sun/star/uno/Sequence.hxx \ + com/sun/star/uno/Type.h \ + com/sun/star/uno/Type.hxx + # Cygwin Doxygen needs unix paths DOXY_INPUT := $(docu_SRCDIR)/main.dox $(addprefix $(OUTDIR)/inc/,$(odk_INCDIRLIST) $(odk_INCFILELIST)) DOXY_INPUT := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(DOXY_INPUT)),$(DOXY_INPUT)) diff --git a/odk/CustomTarget_include.mk b/odk/CustomTarget_include.mk index 8d1ee5aa0f90..c8a12c33a83d 100644 --- a/odk/CustomTarget_include.mk +++ b/odk/CustomTarget_include.mk @@ -11,33 +11,6 @@ $(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/include)) include $(SRCDIR)/solenv/inc/udkversion.mk -odk_INCDIRLIST := sal salhelper rtl osl store typelib uno cppu cppuhelper \ - registry $(if $(filter WNT,$(OS)),systools) -odk_INCFILELIST := com/sun/star/uno/Any.h \ - com/sun/star/uno/Any.hxx \ - com/sun/star/uno/genfunc.h \ - com/sun/star/uno/genfunc.hxx \ - com/sun/star/uno/Reference.h \ - com/sun/star/uno/Reference.hxx \ - com/sun/star/uno/Sequence.h \ - com/sun/star/uno/Sequence.hxx \ - com/sun/star/uno/Type.h \ - com/sun/star/uno/Type.hxx -odk_INCLIST := $(subst $(OUTDIR)/inc/,,$(shell find \ - $(foreach dir,$(odk_INCDIRLIST),$(OUTDIR)/inc/$(dir)) -type f)) \ - $(odk_INCFILELIST) - -define odk_inc -odkcommon_ZIPLIST += include/$(1) -$(call gb_CustomTarget_get_target,odk/odkcommon/include): $(odk_WORKDIR)/include/$(1) -$(odk_WORKDIR)/include/$(1): $(OUTDIR)/inc/$(1) - mkdir -p $$(dir $$@) - $$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1) - cp $$< $$@ -endef - -$(foreach inc,$(odk_INCLIST),$(eval $(call odk_inc,$(inc)))) - odkcommon_ZIPLIST += include/udkversion.mk $(eval $(call gb_CustomTarget_register_target,odk/odkcommon/include,include/udkversion.mk)) $(odk_WORKDIR)/include/udkversion.mk: |