summaryrefslogtreecommitdiff
path: root/audio/gsm/files/patch-ab
blob: f2f9d78e4d4248ca815d6c7587ea73a378f53ff3 (plain) (blame)
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
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
*** Makefile.orig	Tue Jul  2 18:36:06 1996
--- Makefile	Fri Oct 25 17:15:42 1996
***************
*** 7,17 ****
  SASR	= -DSASR
  ######### Define SASR if >> is a signed arithmetic shift (-1 >> 1 == -1)
  
! MULHACK = -DUSE_FLOAT_MUL
  ######### Define this if your host multiplies floats faster than integers,
  ######### e.g. on a SPARCstation.
  
! FAST	= -DFAST
  ######### Define together with USE_FLOAT_MUL to enable the GSM library's
  ######### approximation option for incorrect, but good-enough results.
  
--- 7,19 ----
  SASR	= -DSASR
  ######### Define SASR if >> is a signed arithmetic shift (-1 >> 1 == -1)
  
! #MULHACK = -DUSE_FLOAT_MUL      # Don't define it for FreeBSD, cause SIGFPE
! MULHACK =
  ######### Define this if your host multiplies floats faster than integers,
  ######### e.g. on a SPARCstation.
  
! #FAST    = -DFAST
! FAST    =
  ######### Define together with USE_FLOAT_MUL to enable the GSM library's
  ######### approximation option for incorrect, but good-enough results.
  
***************
*** 43,50 ****
  # CC		= /usr/lang/acc
  # CCFLAGS 	= -c -O
  
! CC		= gcc -ansi -pedantic
! CCFLAGS 	= -c -O2 -DNeedFunctionPrototypes=1
  
  LD 		= $(CC)
  
--- 45,52 ----
  # CC		= /usr/lang/acc
  # CCFLAGS 	= -c -O
  
! #CC              = gcc -ansi -pedantic
! CCFLAGS         = -c -DNeedFunctionPrototypes=1
  
  LD 		= $(CC)
  
***************
*** 59,69 ****
--- 61,73 ----
  ######### Includes needed by $(CC)
  
  # LDINC	= -L/usr/gnu/lib/gcc-2.1/gcc-lib/sparc-sun-sunos4.1.2/2.1
+ LDINC = -L$(LIB)
  ######### Library paths needed by $(LD)
  
  # LDLIB	= -lgcc
  ######### Additional libraries needed by $(LD)
  
+ PREFIX= /usr/local
  
  # Where do you want to install libraries, binaries, a header file
  # and the manual pages?
***************
*** 71,77 ****
  # Leave INSTALL_ROOT empty (or just don't execute "make install") to
  # not install gsm and toast outside of this directory.
  
! INSTALL_ROOT	=
  
  # Where do you want to install the gsm library, header file, and manpages?
  #
--- 75,81 ----
  # Leave INSTALL_ROOT empty (or just don't execute "make install") to
  # not install gsm and toast outside of this directory.
  
! INSTALL_ROOT    =       $(PREFIX)
  
  # Where do you want to install the gsm library, header file, and manpages?
  #
***************
*** 80,86 ****
  
  GSM_INSTALL_ROOT = $(INSTALL_ROOT)
  GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
! GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/inc
  GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
  
  
--- 84,90 ----
  
  GSM_INSTALL_ROOT = $(INSTALL_ROOT)
  GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
! GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/include
  GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
  
  
***************
*** 129,141 ****
  # DEBUG	= -DNDEBUG
  ######### Remove -DNDEBUG to enable assertions.
  
! CFLAGS	= $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
  	$(WAV49) $(CCINC) -I$(INC)
  ######### It's $(CC) $(CFLAGS)
  
  LFLAGS	= $(LDFLAGS) $(LDINC)
  ######### It's $(LD) $(LFLAGS)
  
  
  # Targets
  
--- 133,146 ----
  # DEBUG	= -DNDEBUG
  ######### Remove -DNDEBUG to enable assertions.
  
! CFLAGS += $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
  	$(WAV49) $(CCINC) -I$(INC)
  ######### It's $(CC) $(CFLAGS)
  
  LFLAGS	= $(LDFLAGS) $(LDINC)
  ######### It's $(LD) $(LFLAGS)
  
+ .SUFFIXES: .c .so .o
  
  # Targets
  
***************
*** 258,263 ****
--- 263,269 ----
  
  GSM_INSTALL_TARGETS =	\
  		$(GSM_INSTALL_LIB)/libgsm.a		\
+ 		$(GSM_INSTALL_LIB)/libgsm.so.1.0.10     \
  		$(GSM_INSTALL_INC)/gsm.h		\
  		$(GSM_INSTALL_MAN)/gsm.3		\
  		$(GSM_INSTALL_MAN)/gsm_explode.3	\
***************
*** 277,285 ****
  		$(CC) $(CFLAGS) $?
  		@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
  
  # Target rules
  
! all:		$(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
  		@-echo $(ROOT): Done.
  
  tst:		$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
--- 283,294 ----
  		$(CC) $(CFLAGS) $?
  		@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
  
+ .c.so:
+ 		${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+ 
  # Target rules
  
! all:            $(LIBGSM) $(LIB)/libgsm.so.1.0.10 $(TOAST) $(TCAT) $(UNTOAST)
  		@-echo $(ROOT): Done.
  
  tst:		$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
***************
*** 299,304 ****
--- 308,316 ----
  
  # The basic API: libgsm
  
+ $(LIB)/libgsm.so.1.0.10: $(LIB) $(GSM_OBJECTS:S/o$/so/g)
+ 		ld -Bshareable -o $@ $(GSM_OBJECTS:S/o$/so/g)
+ 
  $(LIBGSM):	$(LIB) $(GSM_OBJECTS)
  		-rm $(RMFLAGS) $(LIBGSM)
  		$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
***************
*** 308,314 ****
  # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
  
  $(TOAST):	$(BIN) $(TOAST_OBJECTS) $(LIBGSM)
! 		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
  
  $(UNTOAST):	$(BIN) $(TOAST)
  		-rm $(RMFLAGS) $(UNTOAST)
--- 320,326 ----
  # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
  
  $(TOAST):	$(BIN) $(TOAST_OBJECTS) $(LIBGSM)
! 		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) -lgsm $(LDLIB)
  
  $(UNTOAST):	$(BIN) $(TOAST)
  		-rm $(RMFLAGS) $(UNTOAST)
***************
*** 394,399 ****
--- 406,417 ----
  		chmod 444 $@
  
  $(GSM_INSTALL_LIB)/libgsm.a:	$(LIBGSM)
+ 		-rm $@
+ 		cp $? $@
+ 		chmod 444 $@
+ 		ranlib $@
+ 
+ $(GSM_INSTALL_LIB)/libgsm.so.1.0.10:    $(LIB)/libgsm.so.1.0.10
  		-rm $@
  		cp $? $@
  		chmod 444 $@