blob: d8838f7f3c876405a1265b2a470ec4813b419d0b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
|
Adopt patches from dev-java/fec which had sources in a dev-space hosted tarball
--- a/fec/src/csrc/Makefile
+++ b/fec/src/csrc/Makefile
@@ -21,32 +21,28 @@ fec: libfec8.so libfec16.so test.c
$(CC) $(CFLAGS) -DGF_BITS=8 -o fec fec8.o test.c
libfec8.so: fec8.o fec8-jinterf.o
- $(CC) $(LDFLAGS) -shared fec8-jinterf.o fec8.o -o libfec8.so
+ $(CC) $(LDFLAGS) -shared fec8-jinterf.o fec8.o -o libfec8.so \
+ -Wl,-soname=libfec8.so
fec8-jinterf.o: fec-jinterf.c
$(CC) $(CFLAGS) -DGF_BITS=8 -c \
-I$(JAVA_HOME)/include/linux fec-jinterf.c \
-o fec8-jinterf.o
-fec8.o: fec.h fec8.S
- $(CC) $(CFLAGS) -DGF_BITS=8 -c -o fec8.o fec8.S
-
-fec8.S: fec.c Makefile
- $(CC) $(CFLAGS) -DGF_BITS=8 -S -o fec8.S fec.c
+fec8.o: fec.h fec.c
+ $(CC) $(CFLAGS) -DGF_BITS=8 -c -o fec8.o fec.c
libfec16.so: fec16.o fec16-jinterf.o
- $(CC) $(LDFLAGS) -shared fec16-jinterf.o fec16.o -o libfec16.so
+ $(CC) $(LDFLAGS) -shared fec16-jinterf.o fec16.o -o libfec16.so \
+ -Wl,-soname=libfec16.so
fec16-jinterf.o: fec-jinterf.c
$(CC) $(CFLAGS) -DGF_BITS=16 -c \
-I$(JAVA_HOME)/include/linux fec-jinterf.c \
-o fec16-jinterf.o
-fec16.o: fec.h fec16.S
- $(CC) $(CFLAGS) -DGF_BITS=16 -c -o fec16.o fec16.S
-
-fec16.S: fec.c Makefile
- $(CC) $(CFLAGS) -DGF_BITS=16 -S -o fec16.S fec.c
+fec16.o: fec.h fec.c
+ $(CC) $(CFLAGS) -DGF_BITS=16 -c -o fec16.o fec.c
clean:
- rm -f *.o *.S fec *.so
--- a/fec/src/csrc/Makefile.nmake
+++ b/fec/src/csrc/Makefile.nmake
@@ -1,42 +1,42 @@
-MAKE=nmake -f Makefile.nmake
-
-CPP=cl.exe
-
-CPP_OPTS=/nologo /I $(JAVA_HOME)/include /I $(JAVA_HOME)/include/win32 \
- /D WIN32 /D _WINDOWS /D _MBCS /D _USRDLL /D FEC_EXPORTS /D GF_BITS=$(BITS) \
- /D inline=__inline
-
-CPP_OPTS=/MT /W3 /Ot /D NDEBUG $(CPP_OPTS)
-
-LIBS=kernel32.lib user32.lib
-
-LDFLAGS=$(LIBS) /nologo /dll /incremental:no \
- /out:fec$(BITS).dll /implib:fec$(BITS).lib \
- /OPT:REF /MAP /DEF:fec$(BITS).def
-
-LD=link.exe
-
-LDOBJS= fec$(BITS).obj fec$(BITS)-jinterf.obj
-
-all: release-all
-
-feclib: fec$(BITS).dll
-
-release-all:
- $(MAKE) BITS=8 MODE=Release feclib
- $(MAKE) BITS=16 MODE=Release feclib
-
-clean:
- del *.dll *.obj *.lib *.pdb *.exp *.map
-
-fec$(BITS).dll : $(DEF_FILE) $(LDOBJS)
- $(LD) $(LDFLAGS) $(LDOBJS)
-
-fec$(BITS).obj : fec.c
- $(CPP) $(CPP_OPTS) /Fo"fec$(BITS).obj" /c fec.c
-
-fec$(BITS)-jinterf.obj : fec-jinterf.c
- $(CPP) $(CPP_OPTS) /Fo"fec$(BITS)-jinterf.obj" /c fec-jinterf.c
-
-.c.obj::
- $(CPP) $(CPP_OPTS) /c $<
+MAKE=nmake -f Makefile.nmake
+
+CPP=cl.exe
+
+CPP_OPTS=/nologo /I $(JAVA_HOME)/include /I $(JAVA_HOME)/include/win32 \
+ /D WIN32 /D _WINDOWS /D _MBCS /D _USRDLL /D FEC_EXPORTS /D GF_BITS=$(BITS) \
+ /D inline=__inline
+
+CPP_OPTS=/MT /W3 /Ot /D NDEBUG $(CPP_OPTS)
+
+LIBS=kernel32.lib user32.lib
+
+LDFLAGS=$(LIBS) /nologo /dll /incremental:no \
+ /out:fec$(BITS).dll /implib:fec$(BITS).lib \
+ /OPT:REF /MAP /DEF:fec$(BITS).def
+
+LD=link.exe
+
+LDOBJS= fec$(BITS).obj fec$(BITS)-jinterf.obj
+
+all: release-all
+
+feclib: fec$(BITS).dll
+
+release-all:
+ $(MAKE) BITS=8 MODE=Release feclib
+ $(MAKE) BITS=16 MODE=Release feclib
+
+clean:
+ del *.dll *.obj *.lib *.pdb *.exp *.map
+
+fec$(BITS).dll : $(DEF_FILE) $(LDOBJS)
+ $(LD) $(LDFLAGS) $(LDOBJS)
+
+fec$(BITS).obj : fec.c
+ $(CPP) $(CPP_OPTS) /Fo"fec$(BITS).obj" /c fec.c
+
+fec$(BITS)-jinterf.obj : fec-jinterf.c
+ $(CPP) $(CPP_OPTS) /Fo"fec$(BITS)-jinterf.obj" /c fec-jinterf.c
+
+.c.obj::
+ $(CPP) $(CPP_OPTS) /c $<
|
