diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-10-29 16:29:19 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-29 23:38:46 +0100 |
| commit | 7963c0952823affb8045817cba677ed7b6e4051c (patch) | |
| tree | 7ce0d3127437766a1f973a2b9a8c6f0a3e6af4a0 /libwps | |
| parent | 7a030393a022622ab2179034332b55da0eb4783b (diff) | |
libwps: ensure that generated cxx files get built after unpack
Change-Id: I75c754a9b1cb59936f1ea6acac92ad47ac417f27
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, 26 insertions, 19 deletions
diff --git a/libwps/Module_libwps.mk b/libwps/Module_libwps.mk index a903fa955389..c84dcbe3a07f 100644 --- a/libwps/Module_libwps.mk +++ b/libwps/Module_libwps.mk @@ -11,6 +11,27 @@ $(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 b18b5833882d..51d89b0895f9 100644 --- a/libwps/StaticLibrary_wps.mk +++ b/libwps/StaticLibrary_wps.mk @@ -22,25 +22,7 @@ $(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,\ - 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 \ + $(addprefix UnpackedTarball/wps/,$(libwps_SOURCEFILES)) \ )) # vim: set noet sw=4 ts=4: diff --git a/libwps/UnpackedTarball_wps.mk b/libwps/UnpackedTarball_wps.mk index e5739281306d..0a9521c25207 100644 --- a/libwps/UnpackedTarball_wps.mk +++ b/libwps/UnpackedTarball_wps.mk @@ -18,4 +18,8 @@ $(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: |