mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "libwps: ensure that generated cxx files get built after unpack"

Browse Source 
This reverts commit 7963c09528.

Should be obsoleted by 3f0f07c748
This commit is contained in:
Michael Stahl
2012-10-29 23:41:45 +01:00
parent 6fcc7d5848
commit 22b055914f
3 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libwps/Module_libwps.mk
View File

@@ -11,27 +11,6 @@ $(eval $(call gb_Module_Module,libwps))
ifeq ($(SYSTEM_LIBWPS),NO) ifeq ($(SYSTEM_LIBWPS),NO)
libwps_SOURCEFILES := \
src/lib/libwps_internal \
src/lib/libwps_tools_win \
src/lib/WPS4 \
src/lib/WPS4Graph \
src/lib/WPS4Text \
src/lib/WPS8 \
src/lib/WPSCell \
src/lib/WPSContentListener \
src/lib/WPSDebug \
src/lib/WPSDocument \
src/lib/WPSHeader \
src/lib/WPSList \
src/lib/WPSOLEParser \
src/lib/WPSOLEStream \
src/lib/WPSPageSpan \
src/lib/WPSParagraph \
src/lib/WPSParser \
src/lib/WPSSubDocument \
src/lib/WPSTable \
$(eval $(call gb_Module_add_targets,libwps,\ $(eval $(call gb_Module_add_targets,libwps,\
ExternalPackage_libwps \ ExternalPackage_libwps \
StaticLibrary_wps \ StaticLibrary_wps \

20
libwps/StaticLibrary_wps.mk
View File

@@ -22,7 +22,25 @@ $(eval $(call gb_StaticLibrary_use_externals,wpslib,\
$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,wpslib,cpp)) $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,wpslib,cpp))
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,wpslib,\ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,wpslib,\
$(addprefix UnpackedTarball/wps/,$(libwps_SOURCEFILES)) \ UnpackedTarball/wps/src/lib/libwps_internal \
UnpackedTarball/wps/src/lib/libwps_tools_win \
UnpackedTarball/wps/src/lib/WPS4 \
UnpackedTarball/wps/src/lib/WPS4Graph \
UnpackedTarball/wps/src/lib/WPS4Text \
UnpackedTarball/wps/src/lib/WPS8 \
UnpackedTarball/wps/src/lib/WPSCell \
UnpackedTarball/wps/src/lib/WPSContentListener \
UnpackedTarball/wps/src/lib/WPSDebug \
UnpackedTarball/wps/src/lib/WPSDocument \
UnpackedTarball/wps/src/lib/WPSHeader \
UnpackedTarball/wps/src/lib/WPSList \
UnpackedTarball/wps/src/lib/WPSOLEParser \
UnpackedTarball/wps/src/lib/WPSOLEStream \
UnpackedTarball/wps/src/lib/WPSPageSpan \
UnpackedTarball/wps/src/lib/WPSParagraph \
UnpackedTarball/wps/src/lib/WPSParser \
UnpackedTarball/wps/src/lib/WPSSubDocument \
UnpackedTarball/wps/src/lib/WPSTable \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

4
libwps/UnpackedTarball_wps.mk
View File

@@ -18,8 +18,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,wps,\
libwps/libwps.gcc.warnings.patch \ libwps/libwps.gcc.warnings.patch \
)) ))
$(eval $(call gb_UnpackedTarball_mark_output_files,wps,\
$(addsuffix .cpp,$(libwps_SOURCEFILES)) \
))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4: