although ustring.h/cpp are in files.bkl apparently rebaking was not a good idea,...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index 4a8f09d8346ce02efa38312f3d74fb63487582ea..7fec422d4d51ea09e528f5df56bfe0471091e3ec 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -414,7 +414,6 @@ ALL_BASE_HEADERS =  \
        wx/types.h \
        wx/unichar.h \
        wx/uri.h \
-       wx/ustring.h \
        wx/utils.h \
        wx/variant.h \
        wx/vector.h \
@@ -565,7 +564,6 @@ ALL_PORTS_BASE_HEADERS =  \
        wx/types.h \
        wx/unichar.h \
        wx/uri.h \
-       wx/ustring.h \
        wx/utils.h \
        wx/variant.h \
        wx/vector.h \
@@ -717,7 +715,6 @@ ALL_BASE_SOURCES =  \
        src/common/txtstrm.cpp \
        src/common/unichar.cpp \
        src/common/uri.cpp \
-       src/common/ustring.cpp \
        src/common/variant.cpp \
        src/common/wfstream.cpp \
        src/common/wxcrt.cpp \
@@ -902,7 +899,6 @@ MONODLL_OBJECTS =  \
        monodll_txtstrm.o \
        monodll_unichar.o \
        monodll_uri.o \
-       monodll_ustring.o \
        monodll_variant.o \
        monodll_wfstream.o \
        monodll_wxcrt.o \
@@ -1018,7 +1014,6 @@ MONOLIB_OBJECTS =  \
        monolib_txtstrm.o \
        monolib_unichar.o \
        monolib_uri.o \
-       monolib_ustring.o \
        monolib_variant.o \
        monolib_wfstream.o \
        monolib_wxcrt.o \
@@ -1132,7 +1127,6 @@ BASEDLL_OBJECTS =  \
        basedll_txtstrm.o \
        basedll_unichar.o \
        basedll_uri.o \
-       basedll_ustring.o \
        basedll_variant.o \
        basedll_wfstream.o \
        basedll_wxcrt.o \
@@ -1229,7 +1223,6 @@ BASELIB_OBJECTS =  \
        baselib_txtstrm.o \
        baselib_unichar.o \
        baselib_uri.o \
-       baselib_ustring.o \
        baselib_variant.o \
        baselib_wfstream.o \
        baselib_wxcrt.o \
@@ -13842,9 +13835,6 @@ monodll_unichar.o: $(srcdir)/src/common/unichar.cpp $(MONODLL_ODEP)
 monodll_uri.o: $(srcdir)/src/common/uri.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/uri.cpp
 
-monodll_ustring.o: $(srcdir)/src/common/ustring.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/ustring.cpp
-
 monodll_variant.o: $(srcdir)/src/common/variant.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/variant.cpp
 
@@ -18384,9 +18374,6 @@ monolib_unichar.o: $(srcdir)/src/common/unichar.cpp $(MONOLIB_ODEP)
 monolib_uri.o: $(srcdir)/src/common/uri.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/uri.cpp
 
-monolib_ustring.o: $(srcdir)/src/common/ustring.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/ustring.cpp
-
 monolib_variant.o: $(srcdir)/src/common/variant.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/variant.cpp
 
@@ -22926,9 +22913,6 @@ basedll_unichar.o: $(srcdir)/src/common/unichar.cpp $(BASEDLL_ODEP)
 basedll_uri.o: $(srcdir)/src/common/uri.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/uri.cpp
 
-basedll_ustring.o: $(srcdir)/src/common/ustring.cpp $(BASEDLL_ODEP)
-       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/ustring.cpp
-
 basedll_variant.o: $(srcdir)/src/common/variant.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/variant.cpp
 
@@ -23730,9 +23714,6 @@ baselib_unichar.o: $(srcdir)/src/common/unichar.cpp $(BASELIB_ODEP)
 baselib_uri.o: $(srcdir)/src/common/uri.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/uri.cpp
 
-baselib_ustring.o: $(srcdir)/src/common/ustring.cpp $(BASELIB_ODEP)
-       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/ustring.cpp
-
 baselib_variant.o: $(srcdir)/src/common/variant.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/variant.cpp