diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-02-25 15:42:23 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-02-25 15:55:02 +0100 |
| commit | 500aa64d6c2a3f413c2ae2de8e3a770f60c245db (patch) | |
| tree | 6383793a572493cdeb76aee78ab37b05ce15dab4 | |
| parent | d6e09503f77f5077ff2df7972e123b74135291b6 (diff) | |
fdo#60924: move emser from scp2 to gbuild
Change-Id: Id90ffae1f38b69005ead8bef9fadc54833813184
| -rw-r--r-- | Repository.mk | 9 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Repository.mk b/Repository.mk index 2d143ef1be23..0967b627059e 100644 --- a/Repository.mk +++ b/Repository.mk @@ -226,6 +226,14 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ basctl \ )) endif +ifeq ($(OS),WNT) +ifeq ($(DISABLE_ATL),) +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ + emser \ +)) +endif +endif + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ bib \ @@ -277,7 +285,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ editeng \ egi \ eme \ - emser \ epb \ epg \ epp \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index fdcb078e2174..5176d3ab3283 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -372,8 +372,6 @@ SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj) #if defined(WNT) && !defined(DISABLE_ATL) -STD_LIB_FILE( gid_File_Lib_Emser, emser ) - File gid_File_Lib_Inprocserv LIB_FILE_BODY; Styles = (PACKED); |