diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-10-29 23:41:45 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-29 23:46:41 +0100 |
| commit | 22b055914f5f1726d45a9802143cff7ada9ededb (patch) | |
| tree | af05ddc7b09bf26e412d2b0f97b54d9a7515b1a8 /libwps | |
| parent | 6fcc7d5848c46e8abbcd86085f5a55f8d25607a3 (diff) | |
Revert "libwps: ensure that generated cxx files get built after unpack"
This reverts commit 7963c0952823affb8045817cba677ed7b6e4051c.
Should be obsoleted by 3f0f07c748375ec9165ea3a3d1751f84d3528972
Diffstat (limited to 'libwps')
| -rw-r--r-- | libwps/Module_libwps.mk | 21 | ||||
| -rw-r--r-- | libwps/StaticLibrary_wps.mk | 20 | ||||
| -rw-r--r-- | libwps/UnpackedTarball_wps.mk | 4 |
3 files changed, 19 insertions, 26 deletions
diff --git a/libwps/Module_libwps.mk b/libwps/Module_libwps.mk index c84dcbe3a07f..a903fa955389 100644 --- a/libwps/Module_libwps.mk +++ b/libwps/Module_libwps.mk @@ -11,27 +11,6 @@ $(eval $(call gb_Module_Module,libwps)) 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,\ ExternalPackage_libwps \ StaticLibrary_wps \ diff --git a/libwps/StaticLibrary_wps.mk b/libwps/StaticLibrary_wps.mk index 51d89b0895f9..b18b5833882d 100644 --- a/libwps/StaticLibrary_wps.mk +++ b/libwps/StaticLibrary_wps.mk @@ -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_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: diff --git a/libwps/UnpackedTarball_wps.mk b/libwps/UnpackedTarball_wps.mk index 0a9521c25207..e5739281306d 100644 --- a/libwps/UnpackedTarball_wps.mk +++ b/libwps/UnpackedTarball_wps.mk @@ -18,8 +18,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,wps,\ libwps/libwps.gcc.warnings.patch \ )) -$(eval $(call gb_UnpackedTarball_mark_output_files,wps,\ - $(addsuffix .cpp,$(libwps_SOURCEFILES)) \ -)) - # vim: set noet sw=4 ts=4: |