Page MenuHomeFreeBSD
Differential D28013 Diff 81815 head/audio/gsm/files/patch-Makefile

Changeset View

Standalone View

View Options

head/audio/gsm/files/patch-Makefile

--- Makefile.orig 2006-04-26 19:14:26 UTC --- Makefile.orig 2020-03-27 14:17:15.000000000 -0700
+++ Makefile +++ Makefile 2020-12-26 17:47:37.889939000 -0800
@@ -43,8 +43,8 @@ WAV49 = -DWAV49 @@ -43,8 +43,8 @@
# CC = /usr/lang/acc # CC = /usr/lang/acc
# CCFLAGS = -c -O # CCFLAGS = -c -O
-CC = gcc -ansi -pedantic -CC = gcc -ansi -pedantic
-CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 -CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment
+#CC = gcc -ansi -pedantic +#CC = gcc -ansi -pedantic
+CCFLAGS += -c -DNeedFunctionPrototypes=1 +CCFLAGS += -c -DNeedFunctionPrototypes=1 -Wall -Wno-comment
LD = $(CC) LD = $(CC)
@@ -59,11 +59,13 @@ LD = $(CC) @@ -59,11 +59,13 @@
######### Includes needed by $(CC) ######### Includes needed by $(CC)
# LDINC = -L/usr/gnu/lib/gcc-2.1/gcc-lib/sparc-sun-sunos4.1.2/2.1 # LDINC = -L/usr/gnu/lib/gcc-2.1/gcc-lib/sparc-sun-sunos4.1.2/2.1
+LDINC = -L$(LIB) +LDINC = -L$(LIB)
######### Library paths needed by $(LD) ######### Library paths needed by $(LD)
# LDLIB = -lgcc # LDLIB = -lgcc
######### Additional libraries needed by $(LD) ######### Additional libraries needed by $(LD)
+#PREFIX= /usr/local +#PREFIX= /usr/local
# Where do you want to install libraries, binaries, a header file # Where do you want to install libraries, binaries, a header file
# and the manual pages? # and the manual pages?
@@ -71,7 +73,7 @@ LD = $(CC) @@ -71,7 +73,7 @@
# Leave INSTALL_ROOT empty (or just don't execute "make install") to # Leave INSTALL_ROOT empty (or just don't execute "make install") to
# not install gsm and toast outside of this directory. # not install gsm and toast outside of this directory.
-INSTALL_ROOT = -INSTALL_ROOT =
+INSTALL_ROOT = $(DESTDIR)$(PREFIX) +INSTALL_ROOT = $(DESTDIR)$(PREFIX)
# Where do you want to install the gsm library, header file, and manpages? # Where do you want to install the gsm library, header file, and manpages?
# #
@@ -80,7 +82,7 @@ INSTALL_ROOT = @@ -80,7 +82,7 @@
GSM_INSTALL_ROOT = $(INSTALL_ROOT) GSM_INSTALL_ROOT = $(INSTALL_ROOT)
GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
-GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/inc -GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/inc
+GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/include +GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/include
GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3 GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
@@ -106,6 +108,7 @@ COMPRESS = compress @@ -106,6 +108,7 @@
COMPRESSFLAGS = COMPRESSFLAGS =
# RANLIB = true # RANLIB = true
RANLIB = ranlib RANLIB = ranlib
+RM = rm -f +RM = rm -f
# #
# You shouldn't have to configure below this line if you're porting. # You shouldn't have to configure below this line if you're porting.
@@ -129,18 +132,19 @@ INC = $(ROOT)/inc @@ -129,18 +132,19 @@
# DEBUG = -DNDEBUG # DEBUG = -DNDEBUG
######### Remove -DNDEBUG to enable assertions. ######### Remove -DNDEBUG to enable assertions.
-CFLAGS = $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \ -CFLAGS = $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
+CFLAGS += $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \ +CFLAGS += $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
$(WAV49) $(CCINC) -I$(INC) $(WAV49) $(CCINC) -I$(INC)
######### It's $(CC) $(CFLAGS) ######### It's $(CC) $(CFLAGS)
LFLAGS = $(LDFLAGS) $(LDINC) LFLAGS = $(LDFLAGS) $(LDINC)
######### It's $(LD) $(LFLAGS) ######### It's $(LD) $(LFLAGS)
+.SUFFIXES: .c .so .o +.SUFFIXES: .c .so .o
# Targets # Targets
-LIBGSM = $(LIB)/libgsm.a -LIBGSM = $(LIB)/libgsm.a
- -
+LIBGSM = libgsm.a +LIBGSM = libgsm.a
+SOLIBGSM = libgsm.so.1 +SOLIBGSM = libgsm.so.1
TOAST = $(BIN)/toast TOAST = $(BIN)/toast
UNTOAST = $(BIN)/untoast UNTOAST = $(BIN)/untoast
TCAT = $(BIN)/tcat TCAT = $(BIN)/tcat
@@ -257,13 +261,15 @@ STUFF = ChangeLog \ @@ -257,13 +261,15 @@
# Install targets # Install targets
GSM_INSTALL_TARGETS = \ GSM_INSTALL_TARGETS = \
- $(GSM_INSTALL_LIB)/libgsm.a \ - $(GSM_INSTALL_LIB)/libgsm.a \
+ $(GSM_INSTALL_LIB)/$(LIBGSM) \ + $(GSM_INSTALL_LIB)/$(LIBGSM) \
+ $(GSM_INSTALL_LIB)/$(SOLIBGSM) \ + $(GSM_INSTALL_LIB)/$(SOLIBGSM) \
$(GSM_INSTALL_INC)/gsm.h \ $(GSM_INSTALL_INC)/gsm.h \
$(GSM_INSTALL_MAN)/gsm.3 \ $(GSM_INSTALL_MAN)/gsm.3 \
$(GSM_INSTALL_MAN)/gsm_explode.3 \ $(GSM_INSTALL_MAN)/gsm_explode.3 \
$(GSM_INSTALL_MAN)/gsm_option.3 \ $(GSM_INSTALL_MAN)/gsm_option.3 \
$(GSM_INSTALL_MAN)/gsm_print.3 $(GSM_INSTALL_MAN)/gsm_print.3
+ +
TOAST_INSTALL_TARGETS = \ TOAST_INSTALL_TARGETS = \
$(TOAST_INSTALL_BIN)/toast \ $(TOAST_INSTALL_BIN)/toast \
$(TOAST_INSTALL_BIN)/tcat \ $(TOAST_INSTALL_BIN)/tcat \
@@ -277,9 +283,12 @@ TOAST_INSTALL_TARGETS = \ @@ -277,9 +283,12 @@
$(CC) $(CFLAGS) $? $(CC) $(CFLAGS) $?
@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1 @-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
+.c.so: +.c.so:
+ ${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} + ${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+ +
# Target rules # Target rules
-all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST) -all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
+all: $(LIB)/$(LIBGSM) $(LIB)/$(SOLIBGSM) $(TOAST) $(TCAT) $(UNTOAST) +all: $(LIB)/$(LIBGSM) $(LIB)/$(SOLIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
@-echo $(ROOT): Done. @-echo $(ROOT): Done.
tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
@@ -299,24 +308,28 @@ install: toastinstall gsminstall @@ -299,24 +308,28 @@
# The basic API: libgsm # The basic API: libgsm
-$(LIBGSM): $(LIB) $(GSM_OBJECTS) -$(LIBGSM): $(LIB) $(GSM_OBJECTS)
- -rm $(RMFLAGS) $(LIBGSM) - -rm $(RMFLAGS) $(LIBGSM)
- $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) - $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
- $(RANLIB) $(LIBGSM) - $(RANLIB) $(LIBGSM)
+$(LIB)/$(SOLIBGSM): $(LIB) $(GSM_OBJECTS:S/o$/so/g) +$(LIB)/$(SOLIBGSM): $(LIB) $(GSM_OBJECTS:S/o$/so/g)
+ $(CC) -o $@ -shared -Wl,-soname,$(SOLIBGSM) $(GSM_OBJECTS:S/o$/so/g) + $(CC) -o $@ -shared -Wl,-soname,$(SOLIBGSM) $(GSM_OBJECTS:S/o$/so/g)
+ (cd $(LIB); $(LN) -sf $(SOLIBGSM) `echo $(SOLIBGSM) | sed 's/\.so.*$$/.so/'`) + (cd $(LIB); $(LN) -sf $(SOLIBGSM) `echo $(SOLIBGSM) | sed 's/\.so.*$$/.so/'`)
+
+$(LIB)/$(LIBGSM): $(LIB) $(GSM_OBJECTS) +$(LIB)/$(LIBGSM): $(LIB) $(GSM_OBJECTS)
+ $(RM) $(RMFLAGS) $(LIBGSM) + $(RM) $(RMFLAGS) $(LIBGSM)
+ $(AR) $(ARFLAGS) $(LIB)/$(LIBGSM) $(GSM_OBJECTS) + $(AR) $(ARFLAGS) $(LIB)/$(LIBGSM) $(GSM_OBJECTS)
+ $(RANLIB) $(LIB)/$(LIBGSM) + $(RANLIB) $(LIB)/$(LIBGSM)
+
# Toast, Untoast and Tcat -- the compress-like frontends to gsm. # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
-$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM) -$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM)
- $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB) - $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
+$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIB)/$(LIBGSM) +$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIB)/$(LIBGSM)
+ $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) -lgsm $(LDLIB) + $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) -lgsm $(LDLIB)
$(UNTOAST): $(BIN) $(TOAST) $(UNTOAST): $(BIN) $(TOAST)
- -rm $(RMFLAGS) $(UNTOAST) - -rm $(RMFLAGS) $(UNTOAST)
- $(LN) $(TOAST) $(UNTOAST) - $(LN) $(TOAST) $(UNTOAST)
+ $(RM) $(RMFLAGS) $(UNTOAST) + $(RM) $(RMFLAGS) $(UNTOAST)
+ $(LN) -sf $(TOAST) $(UNTOAST) + $(LN) -sf $(TOAST) $(UNTOAST)
$(TCAT): $(BIN) $(TOAST) $(TCAT): $(BIN) $(TOAST)
- -rm $(RMFLAGS) $(TCAT) - -rm $(RMFLAGS) $(TCAT)
- $(LN) $(TOAST) $(TCAT) - $(LN) $(TOAST) $(TCAT)
+ $(RM) $(RMFLAGS) $(TCAT) + $(RM) $(RMFLAGS) $(TCAT)
+ $(LN) -sf $(TOAST) $(TCAT) + $(LN) -sf $(TOAST) $(TCAT)
# The local bin and lib directories # The local bin and lib directories
@@ -342,62 +355,66 @@ toastinstall: @@ -342,62 +355,66 @@
gsmuninstall: gsmuninstall:
-if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \ -if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \
- rm $(RMFLAGS) $(GSM_INSTALL_TARGETS) ; \ - rm $(RMFLAGS) $(GSM_INSTALL_TARGETS) ; \
+ $(RM)$(RMFLAGS) $(GSM_INSTALL_TARGETS) ; \ + $(RM)$(RMFLAGS) $(GSM_INSTALL_TARGETS) ; \
fi fi
toastuninstall: toastuninstall:
Show All 22 Lines
+ $(LN) -sf toast $@ + $(LN) -sf toast $@
$(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1 $(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1
- -rm $@ - -rm $@
- cp $? $@ - cp $? $@
- chmod 444 $@ - chmod 444 $@
+ $(RM) $@ + $(RM) $@
+ ${BSD_INSTALL_MAN} $? $@ + ${BSD_INSTALL_MAN} $? $@
+
+$(TOAST_INSTALL_MAN)/untoast.1: $(MAN)/toast.1 +$(TOAST_INSTALL_MAN)/untoast.1: $(MAN)/toast.1
+ $(RM) $@ + $(RM) $@
+ $(LN) -sf toast.1 $@ + $(LN) -sf toast.1 $@
+ +
+$(TOAST_INSTALL_MAN)/tcat.1: $(MAN)/toast.1 +$(TOAST_INSTALL_MAN)/tcat.1: $(MAN)/toast.1
+ $(RM) $@ + $(RM) $@
+ $(LN) -sf toast.1 $@ + $(LN) -sf toast.1 $@
+
$(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3 $(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3
- -rm $@ - -rm $@
- cp $? $@ - cp $? $@
- chmod 444 $@ - chmod 444 $@
+ $(RM) $@ + $(RM) $@
+ ${BSD_INSTALL_MAN} $? $@ + ${BSD_INSTALL_MAN} $? $@
$(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3 $(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3
▲ Show 20 Lines • Show All 42 Lines • Show Last 20 Lines