summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2011-01-26 10:30:19 +0100
committerMathias Bauer <mba@openoffice.org>2011-01-26 10:30:19 +0100
commitb0ccccea6798baa0fc71691fbe01a9b5da85ab60 (patch)
treead263f9e99d0842fa8c70d51687d5215178ae9dd
parent9fa0a785088feeaf3cf4bb502ef8f2e4ec1b1152 (diff)
CWS gnumake3: several clean ups and fixes in makefiles
-rwxr-xr-xsfx2/Module_sfx2.mk6
-rw-r--r--xmloff/Library_xo.mk2
-rw-r--r--xmloff/Library_xof.mk2
3 files changed, 2 insertions, 8 deletions
diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk
index d0e577241468..6ecc7008afe4 100755
--- a/sfx2/Module_sfx2.mk
+++ b/sfx2/Module_sfx2.mk
@@ -50,12 +50,10 @@ $(eval $(call gb_Module_add_targets,sfx2,\
endif
endif
-#todo: source/appl ohne Optimierung?
-#todo: source/control ohne Optimierung?
#todo: source/dialog BUILD_VER_STRING
#todo: source/doc SYSTEM_LIBXML2
-#todo: noopt for acldetect.cxx?
#todo: ENABLE_LAYOUT
-#todo: quickstarter
+#todo: clean up quickstarter stuff in both libraries
+#todo: move standard pool to svl
# vim: set noet sw=4 ts=4:
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index be5eb92215d0..566154a3c480 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -36,12 +36,10 @@ $(eval $(call gb_Library_add_precompiled_header,xo,$(SRCDIR)/xmloff/inc/pch/prec
$(eval $(call gb_Library_set_include,xo,\
$$(SOLARINC) \
-I. \
- -I$(WORKDIR)/inc/ \
-I$(SRCDIR)/xmloff/inc \
-I$(SRCDIR)/xmloff/source/inc \
-I$(SRCDIR)/xmloff/inc/pch \
-I$(OUTDIR)/inc/offuh \
- -I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_set_defs,xo,\
diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk
index 4ce6132743e0..be5c7144aa6e 100644
--- a/xmloff/Library_xof.mk
+++ b/xmloff/Library_xof.mk
@@ -33,9 +33,7 @@ $(eval $(call gb_Library_set_include,xof,\
-I$(SRCDIR)/xmloff/inc/pch \
-I$(SRCDIR)/xmloff/inc \
-I$(SRCDIR)/xmloff/source/inc \
- -I$(WORKDIR)/inc/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc \
-I$(OUTDIR)/inc/offuh \
))