diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2011-07-28 19:11:15 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-12-15 11:59:03 +0100 |
| commit | a4312af08cbd8c69ba4bead9608f3bf549caf7a0 (patch) | |
| tree | 0f682527bc5be83f0fd87617dda41f0856ab7291 /salhelper/prj | |
| parent | 9dab9a26aeaeeaabcef3f4900597ca57e7411a2d (diff) | |
convert salhelper to gbuild
This is a cherry-pick of Matúš's e2f30c078fcf26d481c2e90398b450f6c475a483
from the feature/gbuild branch, with the following modifications by
Stephan Bergmann <sbergman@redhat.com>:
* Adapt salhelper/Makefile to what all those Makefiles currently need to
look like.
* Do not remove salhelper/source/gcc3.map, instead add directly into it
what otherwise solenv/bin/addsym.awk would add to it on Linux.
* In salhelper/Library_salhelper.mk, add code that on Linux takes care of
the soname and symbol versioning required for backwards compatibility.
Solaris would need those features too, and its backwards compatibility
is thus currently broken. Also add a bad hack to create the soname
symlink (xxx.3 -> xxx) in the solver needed on non-Windows platforms (it
is a bad hack for now in that it e.g. is not removed by "make clean").
* In solenv/gbuild/platform/macosx.mk, add an even worse hack to set the
correct install name for libuno_salhelpergcc3.dylib.3, with a trailing
".3".
Diffstat (limited to 'salhelper/prj')
| -rw-r--r-- | salhelper/prj/build.lst | 3 | ||||
| -rw-r--r-- | salhelper/prj/d.lst | 24 | ||||
| -rw-r--r-- | salhelper/prj/makefile.mk | 1 |
3 files changed, 2 insertions, 26 deletions
diff --git a/salhelper/prj/build.lst b/salhelper/prj/build.lst index 9a21849507ff..a449efe001ce 100644 --- a/salhelper/prj/build.lst +++ b/salhelper/prj/build.lst @@ -1,3 +1,2 @@ shp salhelper : sal NULL -shp salhelper usr1 - all shp_mkout NULL -shp salhelper\source nmake - all shp_source NULL +shp salhelper\prj nmake - all shp_prj NULL diff --git a/salhelper/prj/d.lst b/salhelper/prj/d.lst index 2aa89bba83f0..e69de29bb2d1 100644 --- a/salhelper/prj/d.lst +++ b/salhelper/prj/d.lst @@ -1,24 +0,0 @@ -mkdir: %_DEST%\inc\salhelper - -..\inc\salhelper\condition.hxx %_DEST%\inc\salhelper\condition.hxx -..\inc\salhelper\dynload.hxx %_DEST%\inc\salhelper\dynload.hxx -..\inc\salhelper\future.hxx %_DEST%\inc\salhelper\future.hxx -..\inc\salhelper\futurequeue.hxx %_DEST%\inc\salhelper\futurequeue.hxx -..\inc\salhelper\monitor.hxx %_DEST%\inc\salhelper\monitor.hxx -..\inc\salhelper\queue.hxx %_DEST%\inc\salhelper\queue.hxx -..\inc\salhelper\linkhelper.hxx %_DEST%\inc\salhelper\linkhelper.hxx -..\inc\salhelper\refobj.hxx %_DEST%\inc\salhelper\refobj.hxx -..\inc\salhelper\simplereferenceobject.hxx %_DEST%\inc\salhelper\simplereferenceobject.hxx -..\inc\salhelper\singletonref.hxx %_DEST%\inc\salhelper\singletonref.hxx -..\inc\salhelper\timer.hxx %_DEST%\inc\salhelper\timer.hxx - -..\%__SRC%\bin\salhelp*.dll %_DEST%\bin\salhelp*.dll -..\%__SRC%\bin\uno_salhelp*.dll %_DEST%\bin\uno_salhelp*.dll - -..\%__SRC%\lib\*salhelper*.lib %_DEST%\lib\* -..\%__SRC%\lib\libuno_salhelper*.* %_DEST%\lib\* - -..\%__SRC%\lib\libsalhelper*.a %_DEST%\lib\* -..\%__SRC%\lib\salhelper*.lib %_DEST%\lib\* - -linklib: libuno_salhelper*.*.* diff --git a/salhelper/prj/makefile.mk b/salhelper/prj/makefile.mk new file mode 100644 index 000000000000..0997622e00f6 --- /dev/null +++ b/salhelper/prj/makefile.mk @@ -0,0 +1 @@ +.INCLUDE : gbuildbridge.mk |