diff options
| author | Michael Stahl <mst@openoffice.org> | 2011-04-01 20:49:35 +0000 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 09:55:38 +0200 |
| commit | 6bdcd004651080e30dca2e4fba0478a72652ba33 (patch) | |
| tree | 7839696c806ec03485a6c81345e1600a6954e0df /sfx2 | |
| parent | be5380ca70036e874d91d18f9522cd443b58bd64 (diff) | |
gnumake4: #i117610#: add RepositoryExternal.mk, and use it. [hg:62e2f8dc95a7]
Diffstat (limited to 'sfx2')
| -rwxr-xr-x | sfx2/Library_qstart.mk | 3 | ||||
| -rwxr-xr-x | sfx2/Library_sfx.mk | 4 | ||||
| -rwxr-xr-x | sfx2/Module_sfx2.mk | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index 2344d79746c4..2216f54d84a8 100755 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -73,11 +73,12 @@ $(eval $(call gb_Library_add_linked_libs,qstart_gtk,\ utl \ vcl \ vos3 \ - xml2 \ eggtray \ sfx \ )) +$(call gb_Library_use_external,qstart_gtk,libxml2) + $(eval $(call gb_Library_add_exception_objects,qstart_gtk,\ sfx2/source/appl/shutdowniconunx \ )) diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index c18b46c8f16e..a41404109d97 100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -48,7 +48,6 @@ $(eval $(call gb_Library_set_include,sfx,\ $$(INCLUDE) \ -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ - $(LIBXML_CFLAGS) \ )) $(eval $(call gb_Library_set_defs,sfx,\ @@ -75,10 +74,11 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\ utl \ vcl \ vos3 \ - xml2 \ $(gb_STDLIBS) \ )) +$(call gb_Library_use_external,sfx,libxml2) + $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/appl/app \ sfx2/source/appl/appbas \ diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk index b88e2581f2da..f42b8122e9ef 100755 --- a/sfx2/Module_sfx2.mk +++ b/sfx2/Module_sfx2.mk @@ -52,7 +52,6 @@ endif endif #todo: source/dialog BUILD_VER_STRING -#todo: source/doc SYSTEM_LIBXML2 #todo: ENABLE_LAYOUT #todo: clean up quickstarter stuff in both libraries #todo: move standard pool to svl |