diff options
| author | Armin Le Grand <alg@apache.org> | 2013-11-27 16:25:40 +0000 |
|---|---|---|
| committer | Armin Le Grand <alg@apache.org> | 2013-11-27 16:25:40 +0000 |
| commit | 812e2a8bf64274e47db572b8ca592f49b1263ad7 (patch) | |
| tree | 404f9a7432e94c42a09bb76b33eb7d38186ccff6 /ure | |
| parent | 9818d8d1c64bd93adfaacb8a2f824a9db1f4987d (diff) | |
resync to trunk (after accessibility integration)
Diffstat (limited to 'ure')
| -rw-r--r-- | ure/source/uretest/Makefile | 2 | ||||
| -rw-r--r-- | ure/source/uretest/Makefile.pln | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/ure/source/uretest/Makefile b/ure/source/uretest/Makefile index d9b321aa0a11..ed110270c162 100644 --- a/ure/source/uretest/Makefile +++ b/ure/source/uretest/Makefile @@ -114,7 +114,7 @@ out.sdk/cppmain.uno.$(SHAREDLIB_EXT): out.sdk/cppmain.$(OBJ_EXT) version.map | \ 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 diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln index 6147e84c125f..5868d7374946 100644 --- a/ure/source/uretest/Makefile.pln +++ b/ure/source/uretest/Makefile.pln @@ -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 $@ |