diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-10-29 15:36:30 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-10-29 15:36:30 +0200 |
| commit | 91e34e4ccc6c61d0b64d250817af7f0d2263b89e (patch) | |
| tree | 40aada24b74a727c59941b29a8a12c3ea06f0b4f /tools/Package_inc.mk | |
| parent | e775b40a11ca0eab7964dacc8387367086e2b029 (diff) | |
CWS gnumake2: resolve conflicts and make sources buildable on Linux
Diffstat (limited to 'tools/Package_inc.mk')
| -rw-r--r-- | tools/Package_inc.mk | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk index 5deb59a7b0da..27088fd06a48 100644 --- a/tools/Package_inc.mk +++ b/tools/Package_inc.mk @@ -27,12 +27,9 @@ $(eval $(call gb_Package_Package,tools_inc,$(SRCDIR)/tools/inc)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/StringListResource.hxx,tools/StringListResource.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/agapi.hxx,tools/agapi.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/agitem.hxx,tools/agitem.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/appendunixshellword.hxx,tools/appendunixshellword.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/bigint.hxx,tools/bigint.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/cachestr.hxx,tools/cachestr.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/chapi.hxx,tools/chapi.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/color.hxx,tools/color.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/config.hxx,tools/config.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/contnr.hxx,tools/contnr.hxx)) @@ -40,9 +37,7 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/date.hxx,tools/date.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/datetime.hxx,tools/datetime.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/debug.hxx,tools/debug.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/diagnose_ex.h,tools/diagnose_ex.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/download.hxx,tools/download.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/dynary.hxx,tools/dynary.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/eacopier.hxx,tools/eacopier.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/errcode.hxx,tools/errcode.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/errinf.hxx,tools/errinf.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/extendapplicationenvironment.hxx,tools/extendapplicationenvironment.hxx)) @@ -103,7 +98,6 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/tools.h,tools/tools.h)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/toolsdllapi.h,tools/toolsdllapi.h)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqid.hxx,tools/unqid.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqidx.hxx,tools/unqidx.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlkeys.hxx,tools/urlkeys.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlobj.hxx,tools/urlobj.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/vcompat.hxx,tools/vcompat.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/vector2d.hxx,tools/vector2d.hxx)) |