summaryrefslogtreecommitdiff
path: root/odk/util
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2011-02-09 16:20:25 +0100
committerFridrich Štrba <fridrich.strba@bluewin.ch>2011-02-09 16:20:25 +0100
commit1628005298923ad15cc78dbad63669b701f5fd04 (patch)
tree497b0250f13c5b22f80dcba06886878394973372 /odk/util
parent0d2d8ba1a2f3fdab44b5f3e747152fce94679511 (diff)
Trying to remove the stlport mention from the code
Diffstat (limited to 'odk/util')
-rw-r--r--odk/util/makefile.pmk3
-rw-r--r--odk/util/odk_rules.pmk4
2 files changed, 1 insertions, 6 deletions
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index 450adc919f90..782f1e607b27 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -157,8 +157,7 @@ INCLUDETOPDIRLIST= \
$(INCOUT)/cppu \
$(INCOUT)/cppuhelper \
$(INCOUT)/bridges \
- $(INCOUT)/registry \
- $(INCOUT)/stl
+ $(INCOUT)/registry
.IF "$(GUI)"=="WNT"
INCLUDETOPDIRLIST += $(INCOUT)/systools
diff --git a/odk/util/odk_rules.pmk b/odk/util/odk_rules.pmk
index fd5ee3d0ded2..b28e28c6853a 100644
--- a/odk/util/odk_rules.pmk
+++ b/odk/util/odk_rules.pmk
@@ -88,11 +88,7 @@ $(DESTDIR)/cfgWin.js : $(PRJ)/cfgWin.js
$(DESTDIRSETTINGS)/%.mk : $(PRJ)/settings/%.mk
@@-rm -f $@
-.IF "$(COMEX)"=="7"
- $(MY_TEXTCOPY) $< | $(SED) -e 's/stlport_vc7/stlport_vc6/' $@
-.ELSE
$(MY_TEXTCOPY) $< $@
-.ENDIF
$(DESTDIRXML)/module-description.dtd : $(XMLOUT)/module-description.dtd
@@-rm -f $@