diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-06-16 16:10:59 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-06-16 16:10:59 +0200 |
| commit | f6e1fa452313e3916f6bae5ab6c2c07141b34934 (patch) | |
| tree | d1ac1ea5fb207e114f78b8b25230c9ac97585e85 /sw/prj | |
| parent | 331210d4b90e96706b79e3b1158710391664515f (diff) | |
CWS gnumake2: simplified pch, integrated with linktarget
Diffstat (limited to 'sw/prj')
| -rw-r--r-- | sw/prj/target_lib_sw.mk | 2 | ||||
| -rwxr-xr-x | sw/prj/target_module_sw.mk | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/prj/target_lib_sw.mk b/sw/prj/target_lib_sw.mk index 28e0bc45ed0d..ddd2f4507110 100644 --- a/sw/prj/target_lib_sw.mk +++ b/sw/prj/target_lib_sw.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,sw)) $(eval $(call gb_Library_add_sdi_headers,sw,sw/sdi/swslots)) +$(eval $(call gb_Library_add_precompiled_header,sw,$(SRCDIR)/sw/inc/pch/precompiled_sw)) + $(eval $(call gb_Library_set_include,sw,\ -I$(SRCDIR)/sw/source/core/inc \ -I$(SRCDIR)/sw/source/filter/inc \ diff --git a/sw/prj/target_module_sw.mk b/sw/prj/target_module_sw.mk index cb9433eb44e1..20e4944877dd 100755 --- a/sw/prj/target_module_sw.mk +++ b/sw/prj/target_module_sw.mk @@ -26,9 +26,7 @@ #************************************************************************* $(eval $(call gb_Module_Module,sw,\ - $(call gb_PrecompiledHeader_get_target,precompiled_sw) \ -)) - #$(call gb_AllLangResTarget_get_target,sw) \ + $(call gb_AllLangResTarget_get_target,sw) \ $(call gb_Library_get_target,msword) \ $(call gb_Library_get_target,sw) \ $(call gb_Library_get_target,swd) \ @@ -37,11 +35,10 @@ $(eval $(call gb_Module_Module,sw,\ $(call gb_Package_get_target,sw_uiconfig) \ $(call gb_Package_get_target,sw_xml) \ $(call gb_Package_get_target,sw_misc) \ +)) $(eval $(call gb_Module_read_includes,sw,\ - pch_sw \ -)) - #lib_sw \ + lib_sw \ lib_swd \ lib_swui \ lib_msword \ @@ -50,3 +47,4 @@ $(eval $(call gb_Module_read_includes,sw,\ package_uiconfig \ package_xml \ res_sw \ +)) |