]>
Commit | Line | Data |
---|---|---|
cbbb429f JB |
1 | diff -Naur ann_1.1.2.orig/Make-config ann_1.1.2/Make-config |
2 | --- ann_1.1.2.orig/Make-config 2010-01-28 05:40:01.000000000 +0100 | |
3 | +++ ann_1.1.2/Make-config 2013-03-22 15:56:58.290617102 +0100 | |
4 | @@ -67,6 +67,14 @@ | |
5 | # files in the MS_WIN32 directory). | |
6 | #----------------------------------------------------------------------------- | |
7 | ||
8 | +# Linux shared library using g++ | |
9 | +linux: | |
10 | + $(MAKE) targets \ | |
11 | + "ANNLIB = libANN.so.1.0" \ | |
12 | + "ANNDEVLIB = libANN.so" \ | |
13 | + "C++ = g++" \ | |
14 | + "MAKELIB = $(C++) -shared -Wl,-soname -Wl,libANN.so.1 -o" \ | |
15 | + "RANLIB = true" | |
16 | # Linux using g++ | |
17 | linux-g++: | |
18 | $(MAKE) targets \ | |
19 | diff -Naur ann_1.1.2.orig/Makefile ann_1.1.2/Makefile | |
20 | --- ann_1.1.2.orig/Makefile 2010-01-28 05:40:01.000000000 +0100 | |
21 | +++ ann_1.1.2/Makefile 2013-03-22 15:56:58.290617102 +0100 | |
22 | @@ -56,7 +56,7 @@ | |
23 | #----------------------------------------------------------------------------- | |
24 | # main make entry point | |
25 | #----------------------------------------------------------------------------- | |
26 | -alpha-g++ macosx-g++ linux-g++ sgi sunos4 sunos4-g++ sunos5 sunos5-g++ sunos5-g++-sl authors-debug authors-perf: | |
27 | +alpha-g++ macosx-g++ linux linux-g++ sgi sunos4 sunos4-g++ sunos5 sunos5-g++ sunos5-g++-sl authors-debug authors-perf: | |
28 | cd src ; $(MAKE) $@ | |
29 | cd test ; $(MAKE) $@ | |
30 | cd sample ; $(MAKE) $@ | |
31 | diff -Naur ann_1.1.2.orig/src/Makefile ann_1.1.2/src/Makefile | |
32 | --- ann_1.1.2.orig/src/Makefile 2010-01-28 05:40:01.000000000 +0100 | |
33 | +++ ann_1.1.2/src/Makefile 2013-03-22 15:56:58.290617102 +0100 | |
34 | @@ -56,7 +56,8 @@ | |
35 | $(LIBDIR)/$(ANNLIB): $(OBJECTS) | |
36 | $(MAKELIB) $(ANNLIB) $(OBJECTS) | |
37 | $(RANLIB) $(ANNLIB) | |
38 | - mv $(ANNLIB) $(LIBDIR) | |
39 | + [ -z "$(ANNDEVLIB)" ] || ln -s $(ANNLIB) $(ANNDEVLIB) | |
40 | + mv $(ANNLIB) $(ANNDEVLIB) $(LIBDIR) | |
41 | ||
42 | #----------------------------------------------------------------------------- | |
43 | # Make object files |