summaryrefslogtreecommitdiff
path: root/solenv/inc/rules.mk
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-04-23 15:52:08 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-04-23 15:52:08 +0000
commit8034f570cbe5227a12a4cca420844f76d10dc623 (patch)
tree5197805798cf466db87ea43a50084f6a61f5da38 /solenv/inc/rules.mk
parentbc54cd7501259e237bbcf1edab5412cf6160b348 (diff)
CWS-TOOLING: integrate CWS ause100
2009-04-07 18:39:24 +0200 hjs r270608 : #i100932# add chmod to ease later removal 2009-04-03 19:18:44 +0200 hjs r270516 : #i100675# convert for now... 2009-04-03 17:40:55 +0200 hjs r270510 : #i100837# force use of GNU tar 2009-04-03 17:32:11 +0200 hjs r270508 : #i100837# clean tarballs and a readme 2009-04-03 17:29:35 +0200 hjs r270507 : #i100837# introduce $(TAR) and $(GNUTAR) 2009-04-03 12:22:47 +0200 hjs r270469 : #i100793# check for GNU tar 2009-03-30 17:30:20 +0200 hjs r270247 : #i100675# common comp_ver.mk for both windows shells 2009-03-30 13:49:55 +0200 hjs r270226 : #i100675# common comp_ver.mk for both windows shells 2009-03-30 13:36:00 +0200 hjs r270223 : #i100675# no backslash in dependencies 2009-03-30 13:34:14 +0200 hjs r270222 : #i100675# fix testhxx for cygwin 2009-03-27 16:34:33 +0100 hjs r270162 : #i98068# move that block where it makes sense 2009-03-27 16:16:41 +0100 hjs r270160 : #i92036# - two step move to have a simple rename in the shared dir
Diffstat (limited to 'solenv/inc/rules.mk')
-rw-r--r--solenv/inc/rules.mk16
1 files changed, 8 insertions, 8 deletions
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index fbddd365c866..4fc5532f66bd 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -528,7 +528,7 @@ $(MISC)$/%.dpslo :
@@$(RM) $@
@@-$(CDD) $(MISC) && $(!null,$(all_local_slo) $(TYPE:s/+//) echo #) $(foreach,i,$(all_local_slo:b:+".dpcc") s_$(i)) > $(@:f)
@@-$(CDD) $(MISC) && $(!null,$(all_misc_slo) $(TYPE:s/+//) echo #) $(foreach,i,$(all_misc_slo:b:+".dpcc") s_$(i)) >> $(@:f)
- @$(TYPE) $(mktmp $(foreach,i,$(all_local_slo:b:+".dpcc") $(@:^"\n") : $(MISC)$/s_$i) $(foreach,i,$(all_misc_slo:b:+".dpcc") $(@:^"\n") : $(MISC)$/s_$i)) >> $@
+ @$(TYPE) $(mktmp $(foreach,i,$(all_local_slo:b:+".dpcc") $(@:s#\#/#:^"\n") : $(MISC:s#\#/#)/s_$i) $(foreach,i,$(all_misc_slo:b:+".dpcc") $(@:s#\#/#:^"\n") : $(MISC:s#\#/#)$/s_$i)) >> $@
@$(TYPE) $(mktmp $(TARGET)_known_dpcc+=$(all_local_slo:b:+".dpcc":^"s_") $(all_misc_slo:b:+".dpcc":^"s_")) >> $@
$(MISC)$/%.dpobj :
@@ -536,7 +536,7 @@ $(MISC)$/%.dpobj :
@@$(RM) $@
@@-$(CDD) $(MISC) && $(!null,$(all_local_obj) $(TYPE:s/+//) echo #) $(foreach,i,$(all_local_obj:b:+".dpcc") o_$(i)) > $(@:f)
@@-$(CDD) $(MISC) && $(!null,$(all_misc_obj) $(TYPE:s/+//) echo #) $(foreach,i,$(all_misc_obj:b:+".dpcc") o_$(i)) >> $(@:f)
- @$(TYPE) $(mktmp $(foreach,i,$(all_local_obj:b:+".dpcc") $(@:^"\n") : $(MISC)$/o_$i) $(foreach,i,$(all_misc_obj:b:+".dpcc") $(@:^"\n") : $(MISC)$/o_$i)) >> $@
+ @$(TYPE) $(mktmp $(foreach,i,$(all_local_obj:b:+".dpcc") $(@:s#\#/#:^"\n") : $(MISC:s#\#/#)/o_$i) $(foreach,i,$(all_misc_obj:b:+".dpcc") $(@:s#\#/#:^"\n") : $(MISC:s#\#/#)/o_$i)) >> $@
@$(TYPE) $(mktmp $(TARGET)_known_dpcc+=$(all_local_obj:b:+".dpcc":^"s_") $(all_misc_obj:b:+".dpcc":^"s_")) >> $@
# see also %.dpslo
@@ -818,12 +818,12 @@ $(COMMONMISC)$/$(TARGET)$/%.uulf : $$(@:b).ulf
@$(RENAME) $@.$(INPATH) $@
@-$(RM) $@.$(INPATH)
-$(COMMONMISC)$/$(TARGET)$/%.xrm : %.xrm
- -$(MKDIR) $(@:d)
- -$(RM) $@
- $(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
- $(RENAME) $@.$(INPATH) $@
- -$(RM) $@.$(INPATH)
+#$(COMMONMISC)$/$(TARGET)$/%.xrm : %.xrm
+# -$(MKDIR) $(@:d)
+# -$(RM) $@
+# $(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+# $(RENAME) $@.$(INPATH) $@
+# -$(RM) $@.$(INPATH)
# dirty hack
# if local *.sdf file is missing