Modified: openoffice/trunk/main/tools/Executable_mkunroll.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/tools/Executable_mkunroll.mk?rev=1543067&r1=1543066&r2=1543067&view=diff ============================================================================== --- openoffice/trunk/main/tools/Executable_mkunroll.mk (original) +++ openoffice/trunk/main/tools/Executable_mkunroll.mk Mon Nov 18 16:26:19 2013 @@ -30,17 +30,9 @@ $(eval $(call gb_Executable_set_include, -I$(SRCDIR)/tools/bootstrp/ \ )) -STLPORT_DEBUGFLAG = -ifneq ($(USE_SYSTEM_STL),YES) -ifeq ($(PRODUCT),) -STLPORT_DEBUGFLAG = -D_DEBUG -endif -endif - $(eval $(call gb_Executable_set_cxxflags,mkunroll,\ $$(CXXFLAGS) \ -D_TOOLS_STRINGLIST \ - $(STLPORT_DEBUGFLAG) \ )) $(eval $(call gb_Executable_add_linked_libs,mkunroll,\
Modified: openoffice/trunk/main/tools/Executable_rscdep.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/tools/Executable_rscdep.mk?rev=1543067&r1=1543066&r2=1543067&view=diff ============================================================================== --- openoffice/trunk/main/tools/Executable_rscdep.mk (original) +++ openoffice/trunk/main/tools/Executable_rscdep.mk Mon Nov 18 16:26:19 2013 @@ -30,17 +30,9 @@ $(eval $(call gb_Executable_set_include, -I$(SRCDIR)/tools/bootstrp/ \ )) -STLPORT_DEBUGFLAG = -ifneq ($(USE_SYSTEM_STL),YES) -ifeq ($(PRODUCT),) -STLPORT_DEBUGFLAG = -D_DEBUG -endif -endif - $(eval $(call gb_Executable_set_cxxflags,rscdep,\ $$(CXXFLAGS) \ -D_TOOLS_STRINGLIST \ - $(STLPORT_DEBUGFLAG) \ )) $(eval $(call gb_Executable_add_linked_libs,rscdep,\ Modified: openoffice/trunk/main/tools/Executable_so_checksum.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/tools/Executable_so_checksum.mk?rev=1543067&r1=1543066&r2=1543067&view=diff ============================================================================== --- openoffice/trunk/main/tools/Executable_so_checksum.mk (original) +++ openoffice/trunk/main/tools/Executable_so_checksum.mk Mon Nov 18 16:26:19 2013 @@ -30,13 +30,6 @@ $(eval $(call gb_Executable_set_include, -I$(SRCDIR)/tools/bootstrp/ \ )) -STLPORT_DEBUGFLAG = -ifneq ($(USE_SYSTEM_STL),YES) -ifeq ($(PRODUCT),) -STLPORT_DEBUGFLAG = -D_DEBUG -endif -endif - $(eval $(call gb_Executable_set_cxxflags,so_checksum,\ $$(CXXFLAGS) \ -D_TOOLS_STRINGLIST \ Modified: openoffice/trunk/main/tools/Executable_sspretty.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/tools/Executable_sspretty.mk?rev=1543067&r1=1543066&r2=1543067&view=diff ============================================================================== --- openoffice/trunk/main/tools/Executable_sspretty.mk (original) +++ openoffice/trunk/main/tools/Executable_sspretty.mk Mon Nov 18 16:26:19 2013 @@ -30,13 +30,6 @@ $(eval $(call gb_Executable_set_include, -I$(SRCDIR)/tools/bootstrp/ \ )) -STLPORT_DEBUGFLAG = -ifneq ($(USE_SYSTEM_STL),YES) -ifeq ($(PRODUCT),) -STLPORT_DEBUGFLAG = -D_DEBUG -endif -endif - $(eval $(call gb_Executable_set_cxxflags,sspretty,\ $$(CXXFLAGS) \ -D_TOOLS_STRINGLIST \ Modified: openoffice/trunk/main/ure/source/uretest/Makefile URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ure/source/uretest/Makefile?rev=1543067&r1=1543066&r2=1543067&view=diff ============================================================================== --- openoffice/trunk/main/ure/source/uretest/Makefile (original) +++ openoffice/trunk/main/ure/source/uretest/Makefile Mon Nov 18 16:26:19 2013 @@ -114,7 +114,7 @@ out.sdk/cppmain.uno.$(SHAREDLIB_EXT): ou out.sdk $(LINK) $(COMP_LINK_FLAGS) $(link_output_switch)$@ $< $(LINK_LIBS) \ $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(SALHELPERLIB) \ - $(STLPORTLIB) $(link_std_libs) + $(link_std_libs) out.sdk/cppmain.$(OBJ_EXT): cppmain.cc out.sdk/cpputypes.cppumaker.flag \ out.sdk/types.cppumaker.flag | out.sdk Modified: openoffice/trunk/main/ure/source/uretest/Makefile.pln URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ure/source/uretest/Makefile.pln?rev=1543067&r1=1543066&r2=1543067&view=diff ============================================================================== --- openoffice/trunk/main/ure/source/uretest/Makefile.pln (original) +++ openoffice/trunk/main/ure/source/uretest/Makefile.pln Mon Nov 18 16:26:19 2013 @@ -84,11 +84,10 @@ clean: out.pln/cppmain.uno.so: out.pln/cppmain.o version.map | out.pln \ out.pln/lib/libuno_cppu.so out.pln/lib/libuno_cppuhelpergcc3.so \ - out.pln/lib/libuno_sal.so out.pln/lib/libuno_salhelpergcc3.so \ - out.pln/lib/libstlport_gcc.so + out.pln/lib/libuno_sal.so out.pln/lib/libuno_salhelpergcc3.so g++ -shared -o $@ -Wl,-z,defs -Wl,--fatal-warnings \ -Wl,--version-script=version.map $< -Lout.pln/lib -luno_cppu \ - -luno_cppuhelpergcc3 -luno_sal -luno_salhelpergcc3 -lstlport_gcc + -luno_cppuhelpergcc3 -luno_sal -luno_salhelpergcc3 out.pln/cppmain.o: cppmain.cc out.pln/cpputypes.cppumaker.flag \ out.pln/types.cppumaker.flag | out.pln @@ -295,9 +294,6 @@ out.pln/lib/libuno_sal.so: | out.pln/lib out.pln/lib/libuno_salhelpergcc3.so: | out.pln/lib ln -fs $(URE_HOME)/lib/libuno_salhelpergcc3.so.3 $@ -out.pln/lib/libstlport_gcc.so: | out.pln/lib - ln -fs $(URE_HOME)/lib/libstlport_gcc.so $@ - out.pln: mkdir $@ Modified: openoffice/trunk/main/vcl/Library_vcl.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_vcl.mk?rev=1543067&r1=1543066&r2=1543067&view=diff ============================================================================== --- openoffice/trunk/main/vcl/Library_vcl.mk (original) +++ openoffice/trunk/main/vcl/Library_vcl.mk Mon Nov 18 16:26:19 2013 @@ -458,16 +458,6 @@ $(eval $(call gb_Library_add_exception_o vcl/source/glyphs/graphite_textsrc \ )) -#building with stlport, but graphite was not built with stlport -ifneq ($(USE_SYSTEM_STL),YES) -ifeq ($(SYSTEM_GRAPHITE),YES) -$(eval $(call gb_Library_set_defs,vcl,\ - $$(DEFS) \ - -DADAPT_EXT_STL \ -)) -endif -endif - # handle X11 platforms, which have additional files and possibly system graphite ifeq ($(GUIBASE),unx) $(eval $(call gb_Library_add_exception_objects,vcl,\
