diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-06-01 17:28:33 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-06-01 17:28:33 +0200 |
| commit | 1921d141cff63af5d9ffc331355ab350bb8f7c10 (patch) | |
| tree | 45731b9fee1f3ca763c10149e90dc6aacdde555a /sw/prj | |
| parent | CWS gnumake2: reverting accidental modification in sw (diff) | |
| download | core-1921d141cff63af5d9ffc331355ab350bb8f7c10.tar.gz core-1921d141cff63af5d9ffc331355ab350bb8f7c10.zip | |
CWS gnumake2: fitting sdi into the workdir structure
Diffstat (limited to 'sw/prj')
| -rw-r--r-- | sw/prj/target_lib_sw.mk | 4 | ||||
| -rw-r--r-- | sw/prj/target_lib_swui.mk | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sw/prj/target_lib_sw.mk b/sw/prj/target_lib_sw.mk index 261dc3c75b4a..28e0bc45ed0d 100644 --- a/sw/prj/target_lib_sw.mk +++ b/sw/prj/target_lib_sw.mk @@ -35,8 +35,8 @@ $(eval $(call gb_Library_set_include,sw,\ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/inc/pch \ -I$(SRCDIR)/sw/inc \ - -I$(WORKDIR)/inc/sw/sdi \ - -I$(WORKDIR)/inc/sw/ \ + -I$(WORKDIR)/SdiTarget/sw/sdi \ + -I$(WORKDIR)/Misc/sw/ \ $$(INCLUDE) \ -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ diff --git a/sw/prj/target_lib_swui.mk b/sw/prj/target_lib_swui.mk index 7a2fba5f96ac..49ca6c01dc98 100644 --- a/sw/prj/target_lib_swui.mk +++ b/sw/prj/target_lib_swui.mk @@ -28,14 +28,14 @@ $(eval $(call gb_Library_Library,swui)) $(eval $(call gb_Library_set_include,swui,\ - $$(INCLUDE) \ - -I$(WORKDIR)/inc/sw/sdi \ - -I$(WORKDIR)/inc/sw/ \ -I$(SRCDIR)/sw/inc \ -I$(SRCDIR)/sw/inc/pch \ -I$(SRCDIR)/sw/source/core/inc \ -I$(SRCDIR)/sw/source/filter/inc \ -I$(SRCDIR)/sw/source/ui/inc \ + -I$(WORKDIR)/SdiTarget/sw/sdi \ + -I$(WORKDIR)/Misc/sw \ + $$(INCLUDE) \ -I$(OUTDIR)/inc/sw \ -I$(OUTDIR)/inc/offuh \ )) @@ -166,21 +166,21 @@ $(eval $(call gb_Library_add_exception_objects,swui,\ sw/source/ui/utlui/swrenamexnameddlg \ )) -$(WORKDIR)/inc/sw/swuilib.hxx : +$(WORKDIR)/Misc/sw/swuilib.hxx : $(call gb_Helper_announce,Creating swuilib.hxx ...) mkdir -p `dirname $@` && echo "#define DLL_NAME \"$(notdir $(call gb_Library_get_target,swui))\"" > $@ -.PHONY : $(WORKDIR)/Clean/inc/sw/swuilib.hxx +.PHONY : $(WORKDIR)/Clean/Misc/sw/swuilib.hxx $(WORKDIR)/Clean/inc/sw/swuilib.hxx : $(call gb_Helper_announce,Cleaning up swuilib.hxx ...) -$(call gb_Helper_abbreviate_dirs,\ rm -f $(WORKDIR)/inc/sw/swuilib.hxx) -$(call gb_CxxObject_get_dep_target,sw/source/ui/dialog/swabstdlg) : $(WORKDIR)/inc/sw/swuilib.hxx -$(call gb_CxxObject_get_target,sw/source/ui/dialog/swabstdlg) : $(WORKDIR)/inc/sw/swuilib.hxx +$(call gb_CxxObject_get_dep_target,sw/source/ui/dialog/swabstdlg) : $(WORKDIR)/Misc/sw/swuilib.hxx +$(call gb_CxxObject_get_target,sw/source/ui/dialog/swabstdlg) : $(WORKDIR)/Misc/sw/swuilib.hxx -$(call gb_Library_get_clean_target,swui) : $(WORKDIR)/Clean/inc/sw/swuilib.hxx +$(call gb_Library_get_clean_target,swui) : $(WORKDIR)/Clean/Misc/sw/swuilib.hxx ifeq ($(OS),WNT) $(eval $(call gb_Library_add_linked_libs,swui,\ |