head 1.12; access; symbols pkgsrc-2019Q1:1.11.0.10 pkgsrc-2019Q1-base:1.11 pkgsrc-2018Q4:1.11.0.8 pkgsrc-2018Q4-base:1.11 pkgsrc-2018Q3:1.11.0.6 pkgsrc-2018Q3-base:1.11 pkgsrc-2018Q2:1.11.0.4 pkgsrc-2018Q2-base:1.11 pkgsrc-2018Q1:1.11.0.2 pkgsrc-2018Q1-base:1.11 pkgsrc-2017Q4:1.10.0.74 pkgsrc-2017Q4-base:1.10 pkgsrc-2017Q3:1.10.0.72 pkgsrc-2017Q3-base:1.10 pkgsrc-2017Q2:1.10.0.68 pkgsrc-2017Q2-base:1.10 pkgsrc-2017Q1:1.10.0.66 pkgsrc-2017Q1-base:1.10 pkgsrc-2016Q4:1.10.0.64 pkgsrc-2016Q4-base:1.10 pkgsrc-2016Q3:1.10.0.62 pkgsrc-2016Q3-base:1.10 pkgsrc-2016Q2:1.10.0.60 pkgsrc-2016Q2-base:1.10 pkgsrc-2016Q1:1.10.0.58 pkgsrc-2016Q1-base:1.10 pkgsrc-2015Q4:1.10.0.56 pkgsrc-2015Q4-base:1.10 pkgsrc-2015Q3:1.10.0.54 pkgsrc-2015Q3-base:1.10 pkgsrc-2015Q2:1.10.0.52 pkgsrc-2015Q2-base:1.10 pkgsrc-2015Q1:1.10.0.50 pkgsrc-2015Q1-base:1.10 pkgsrc-2014Q4:1.10.0.48 pkgsrc-2014Q4-base:1.10 pkgsrc-2014Q3:1.10.0.46 pkgsrc-2014Q3-base:1.10 pkgsrc-2014Q2:1.10.0.44 pkgsrc-2014Q2-base:1.10 pkgsrc-2014Q1:1.10.0.42 pkgsrc-2014Q1-base:1.10 pkgsrc-2013Q4:1.10.0.40 pkgsrc-2013Q4-base:1.10 pkgsrc-2013Q3:1.10.0.38 pkgsrc-2013Q3-base:1.10 pkgsrc-2013Q2:1.10.0.36 pkgsrc-2013Q2-base:1.10 pkgsrc-2013Q1:1.10.0.34 pkgsrc-2013Q1-base:1.10 pkgsrc-2012Q4:1.10.0.32 pkgsrc-2012Q4-base:1.10 pkgsrc-2012Q3:1.10.0.30 pkgsrc-2012Q3-base:1.10 pkgsrc-2012Q2:1.10.0.28 pkgsrc-2012Q2-base:1.10 pkgsrc-2012Q1:1.10.0.26 pkgsrc-2012Q1-base:1.10 pkgsrc-2011Q4:1.10.0.24 pkgsrc-2011Q4-base:1.10 pkgsrc-2011Q3:1.10.0.22 pkgsrc-2011Q3-base:1.10 pkgsrc-2011Q2:1.10.0.20 pkgsrc-2011Q2-base:1.10 pkgsrc-2011Q1:1.10.0.18 pkgsrc-2011Q1-base:1.10 pkgsrc-2010Q4:1.10.0.16 pkgsrc-2010Q4-base:1.10 pkgsrc-2010Q3:1.10.0.14 pkgsrc-2010Q3-base:1.10 pkgsrc-2010Q2:1.10.0.12 pkgsrc-2010Q2-base:1.10 pkgsrc-2010Q1:1.10.0.10 pkgsrc-2010Q1-base:1.10 pkgsrc-2009Q4:1.10.0.8 pkgsrc-2009Q4-base:1.10 pkgsrc-2009Q3:1.10.0.6 pkgsrc-2009Q3-base:1.10 pkgsrc-2009Q2:1.10.0.4 pkgsrc-2009Q2-base:1.10 pkgsrc-2009Q1:1.10.0.2 pkgsrc-2009Q1-base:1.10 pkgsrc-2008Q4:1.9.0.10 pkgsrc-2008Q4-base:1.9 pkgsrc-2008Q3:1.9.0.8 pkgsrc-2008Q3-base:1.9 cube-native-xorg:1.9.0.6 cube-native-xorg-base:1.9 pkgsrc-2008Q2:1.9.0.4 pkgsrc-2008Q2-base:1.9 cwrapper:1.9.0.2 pkgsrc-2008Q1:1.7.0.36 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.34 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.32 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.30 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.28 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.26 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.24 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.22 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.20 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.18 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.16 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.14 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.12 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.7.0.10 pkgsrc-2004Q4-base:1.7 pkgsrc-2004Q3:1.7.0.8 pkgsrc-2004Q3-base:1.7 pkgsrc-2004Q2:1.7.0.6 pkgsrc-2004Q2-base:1.7 pkgsrc-2004Q1:1.7.0.4 pkgsrc-2004Q1-base:1.7 pkgsrc-2003Q4:1.7.0.2 pkgsrc-2003Q4-base:1.7 netbsd-1-6-1:1.6.0.6 netbsd-1-6-1-base:1.6 netbsd-1-6:1.6.0.8 netbsd-1-6-RELEASE-base:1.6 pkgviews:1.6.0.4 pkgviews-base:1.6 buildlink2:1.6.0.2 buildlink2-base:1.6 netbsd-1-5-PATCH003:1.6 netbsd-1-5-PATCH001:1.6 netbsd-1-5-RELEASE:1.6 netbsd-1-4-PATCH003:1.6 netbsd-1-4-PATCH002:1.6 comdex-fall-1999:1.5 netbsd-1-4-PATCH001:1.5 netbsd-1-4-RELEASE:1.5 netbsd-1-3-PATCH003:1.5 netbsd-1-3-PATCH002:1.4 FreeBSD-97-10-25:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.12 date 2019.06.15.08.41.30; author adam; state dead; branches; next 1.11; commitid DBQ7cnwn2MHSigrB; 1.11 date 2018.01.17.12.03.01; author wiz; state Exp; branches; next 1.10; commitid 5ShHBYXp1B5AWdnA; 1.10 date 2009.02.03.06.09.09; author obache; state Exp; branches; next 1.9; 1.9 date 2008.05.20.19.30.01; author tnn; state Exp; branches; next 1.8; 1.8 date 2008.04.04.15.24.20; author joerg; state Exp; branches; next 1.7; 1.7 date 2003.09.18.18.55.23; author wiz; state Exp; branches; next 1.6; 1.6 date 2000.01.26.22.09.32; author jlam; state Exp; branches; next 1.5; 1.5 date 98.08.07.10.35.56; author agc; state Exp; branches; next 1.4; 1.4 date 98.03.16.07.44.00; author mycroft; state Exp; branches; next 1.3; 1.3 date 97.11.17.13.56.56; author agc; state Exp; branches; next 1.2; 1.2 date 97.11.14.14.12.34; author agc; state Exp; branches; next 1.1; 1.1 date 97.10.28.23.18.30; author augustss; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 97.10.28.23.18.30; author augustss; state Exp; branches; next ; desc @@ 1.12 log @gsm: updated to 1.0.18 1.0.18: Remove the MacOS "quarantine" files that I didn't know I'd shipped. Remove some trailing spaces. Bump up the patchlevel in inc/gsm.h (I'd forgotten that in release 17.) 1.0.17: New email addresses in the README. Avoid left-shifting signed integers. Don't print longwords using %d or %ld, cast them to (long) first. Don't compare longwords as longs in addtest, we only care for the lower 32 bits. (The math works, but the test failed.) 1.0.16: New email addresses in the manual pages (patch 16) Removed a stray .orig file (in patch 15) @ text @$NetBSD: patch-ab,v 1.11 2018/01/17 12:03:01 wiz Exp $ --- Makefile.orig 2006-04-26 19:14:26.000000000 +0000 +++ Makefile @@@@ -43,7 +43,7 @@@@ WAV49 = -DWAV49 # CC = /usr/lang/acc # CCFLAGS = -c -O -CC = gcc -ansi -pedantic +# CC = gcc -ansi -pedantic CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 LD = $(CC) @@@@ -71,7 +71,7 @@@@ LD = $(CC) # Leave INSTALL_ROOT empty (or just don't execute "make install") to # not install gsm and toast outside of this directory. -INSTALL_ROOT = +# INSTALL_ROOT = # Where do you want to install the gsm library, header file, and manpages? # @@@@ -80,8 +80,8 @@@@ INSTALL_ROOT = 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 +GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/include +GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/${PKGMANDIR}/man3 # Where do you want to install the toast binaries and their manpage? @@@@ -91,13 +91,14 @@@@ GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/ma TOAST_INSTALL_ROOT = $(INSTALL_ROOT) TOAST_INSTALL_BIN = $(TOAST_INSTALL_ROOT)/bin -TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/man/man1 +TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/${PKGMANDIR}/man1 # Other tools SHELL = /bin/sh -LN = ln +LN = ln -s BASENAME = basename +DIRNAME = dirname AR = ar ARFLAGS = cr RMFLAGS = @@@@ -114,7 +115,7 @@@@ RANLIB = ranlib # Local Directories -ROOT = . +#ROOT = . ADDTST = $(ROOT)/add-test TST = $(ROOT)/tst MAN = $(ROOT)/man @@@@ -129,7 +130,7 @@@@ INC = $(ROOT)/inc # DEBUG = -DNDEBUG ######### Remove -DNDEBUG to enable assertions. -CFLAGS = $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \ +CFLAGS += $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \ $(WAV49) $(CCINC) -I$(INC) ######### It's $(CC) $(CFLAGS) @@@@ -139,7 +140,7 @@@@ LFLAGS = $(LDFLAGS) $(LDINC) # Targets -LIBGSM = $(LIB)/libgsm.a +LIBGSM = $(LIB)/libgsm.la TOAST = $(BIN)/toast UNTOAST = $(BIN)/untoast @@@@ -257,7 +258,7 @@@@ STUFF = ChangeLog \ # Install targets GSM_INSTALL_TARGETS = \ - $(GSM_INSTALL_LIB)/libgsm.a \ + $(GSM_INSTALL_LIB)/libgsm.la \ $(GSM_INSTALL_INC)/gsm.h \ $(GSM_INSTALL_MAN)/gsm.3 \ $(GSM_INSTALL_MAN)/gsm_explode.3 \ @@@@ -273,10 +274,15 @@@@ TOAST_INSTALL_TARGETS = \ # Default rules +.SUFFIXES: .o .lo + .c.o: $(CC) $(CFLAGS) $? @@-mv `$(BASENAME) $@@` $@@ > /dev/null 2>&1 +.c.lo: + cd `${DIRNAME} $@@` && ${LIBTOOL} --mode=compile ${CC} ${CFLAGS} $? + # Target rules all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST) @@@@ -299,16 +305,20 @@@@ install: toastinstall gsminstall # The basic API: libgsm -$(LIBGSM): $(LIB) $(GSM_OBJECTS) +$(LIBGSM): $(LIB) $(GSM_OBJECTS:.o=.lo) -rm $(RMFLAGS) $(LIBGSM) - $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) - $(RANLIB) $(LIBGSM) + cd $(LIB) && \ + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o `$(BASENAME) $@@` \ + $(GSM_OBJECTS:.o=.lo) \ + -rpath $(PREFIX)/lib -version-info 1:12 # Toast, Untoast and Tcat -- the compress-like frontends to gsm. $(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM) - $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB) + cd $(BIN) && \ + $(LIBTOOL) --mode=link $(LD) $(LFLAGS) -o `$(BASENAME) $@@` \ + $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB) $(UNTOAST): $(BIN) $(TOAST) -rm $(RMFLAGS) $(UNTOAST) @@@@ -332,12 +342,12 @@@@ $(LIB): gsminstall: -if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \ - make $(GSM_INSTALL_TARGETS) ; \ + $(MAKE) $(GSM_INSTALL_TARGETS) ; \ fi toastinstall: -if [ x"$(TOAST_INSTALL_ROOT)" != x ]; then \ - make $(TOAST_INSTALL_TARGETS); \ + $(MAKE) $(TOAST_INSTALL_TARGETS); \ fi gsmuninstall: @@@@ -351,52 +361,34 @@@@ toastuninstall: fi $(TOAST_INSTALL_BIN)/toast: $(TOAST) - -rm $@@ - cp $(TOAST) $@@ - chmod 755 $@@ + ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} $? $(TOAST_INSTALL_BIN) $(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast - -rm $@@ - ln $? $@@ + ${LN} -f toast $@@ $(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast - -rm $@@ - ln $? $@@ + ${LN} -f toast $@@ $(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1 - -rm $@@ - cp $? $@@ - chmod 444 $@@ + ${BSD_INSTALL_MAN} $? $(TOAST_INSTALL_MAN) $(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3 - -rm $@@ - cp $? $@@ - chmod 444 $@@ + ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN) $(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3 - -rm $@@ - cp $? $@@ - chmod 444 $@@ + ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN) $(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3 - -rm $@@ - cp $? $@@ - chmod 444 $@@ + ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN) $(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3 - -rm $@@ - cp $? $@@ - chmod 444 $@@ + ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN) $(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h - -rm $@@ - cp $? $@@ - chmod 444 $@@ - -$(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM) - -rm $@@ - cp $? $@@ - chmod 444 $@@ + ${BSD_INSTALL_DATA} $? $(GSM_INSTALL_INC) + +$(GSM_INSTALL_LIB)/libgsm.la: $(LIBGSM) + ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $? $(GSM_INSTALL_LIB) # Distribution @ 1.11 log @gsm: honor LDFLAGS. Fixes RELRO build. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.10 2009/02/03 06:09:09 obache Exp $ @ 1.10 log @Update gsm to 1.0.12 a.k.a 1.0-pl12. Bump ABI_DEPENDS because reentrant fix changed struct gsm_state. (It is defined in gsm/private.h, but used by other packages directly). Fri Jun 2 06:27:56 2006 Jutta Degener (jutta@@pobox.com) * Release 1.0 Patchlevel 12 src/code.c: removed modifiable static storage that made the library non-reentrant. (Thanks to Paul Gibbs for pointing out the bug.) Sat Mar 18 11:48:28 2006 Jutta Degener (jutta@@pobox.com) * Release 1.0 Patchlevel 11 src/gsm_implode.c: fix WAV49 implode move source archive location @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.9 2008/05/20 19:30:01 tnn Exp $ d113 1 a113 1 + $(LIBTOOL) --mode=link $(CC) -o `$(BASENAME) $@@` \ @ 1.9 log @Honour PKGMANDIR @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- Makefile.orig 1996-07-02 16:36:06.000000000 +0200 d5 1 a5 17 @@@@ -7,11 +7,13 @@@@ SASR = -DSASR ######### Define SASR if >> is a signed arithmetic shift (-1 >> 1 == -1) -MULHACK = -DUSE_FLOAT_MUL +#MULHACK = -DUSE_FLOAT_MUL +MULHACK = ######### Define this if your host multiplies floats faster than integers, ######### e.g. on a SPARCstation. -FAST = -DFAST +#FAST = -DFAST +FAST = ######### Define together with USE_FLOAT_MUL to enable the GSM library's ######### approximation option for incorrect, but good-enough results. @@@@ -43,7 +45,7 @@@@ WAV49 = d14 1 a14 1 @@@@ -71,7 +73,7 @@@@ LD = $(CC) d23 1 a23 1 @@@@ -80,8 +82,8 @@@@ INSTALL_ROOT = d34 1 a34 1 @@@@ -91,13 +93,14 @@@@ GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/ma d51 1 a51 1 @@@@ -114,7 +117,7 @@@@ RANLIB = ranlib d60 1 a60 1 @@@@ -129,7 +132,7 @@@@ INC = $(ROOT)/inc d69 1 a69 1 @@@@ -139,7 +142,7 @@@@ LFLAGS = $(LDFLAGS) $(LDINC) d78 1 a78 1 @@@@ -257,7 +260,7 @@@@ STUFF = ChangeLog \ d87 1 a87 1 @@@@ -273,10 +276,15 @@@@ TOAST_INSTALL_TARGETS = \ d103 1 a103 1 @@@@ -299,16 +307,20 @@@@ install: toastinstall gsminstall d115 1 a115 1 + -rpath $(PREFIX)/lib -version-info 1:10 d128 1 a128 1 @@@@ -332,12 +344,12 @@@@ $(LIB): d143 1 a143 1 @@@@ -351,52 +363,34 @@@@ toastuninstall: @ 1.8 log @DESTDIR support. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.7 2003/09/18 18:55:23 wiz Exp $ d3 2 a4 2 --- Makefile.orig Tue Jul 2 10:36:06 1996 +++ Makefile Sun Jan 16 02:16:43 2000 d21 1 a21 1 @@@@ -43,7 +45,7 @@@@ d30 1 a30 1 @@@@ -71,7 +73,7 @@@@ d39 1 a39 1 @@@@ -80,7 +82,7 @@@@ d44 1 d46 1 a46 1 GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3 d49 8 a56 1 @@@@ -96,8 +98,9 @@@@ d67 1 a67 1 @@@@ -114,7 +117,7 @@@@ d76 1 a76 1 @@@@ -129,7 +132,7 @@@@ d85 1 a85 1 @@@@ -139,7 +142,7 @@@@ d94 1 a94 1 @@@@ -257,7 +260,7 @@@@ d103 1 a103 1 @@@@ -273,10 +276,15 @@@@ d119 1 a119 1 @@@@ -299,16 +307,20 @@@@ d144 1 a144 1 @@@@ -332,12 +344,12 @@@@ d159 1 a159 1 @@@@ -351,52 +363,34 @@@@ @ 1.7 log @Call libtool with appropriate --mode argument. From Ron Roskens in PR 22826. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.6 2000/01/26 22:09:32 jlam Exp $ d123 1 a123 1 + -rpath $(GSM_INSTALL_LIB) -version-info 1:10 d212 1 a212 1 + ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} $? $(GSM_INSTALL_LIB) @ 1.6 log @* Libtoolize libgsm.a build. * Use a shared library numbering scheme of libgsm.so.x.y instead of libgsm.so.x.y.z. Instead of libgsm.so.1.0.10, we now have libgsm.so.1.10. @ text @d1 1 a1 1 $NetBSD$ d106 1 a106 1 + cd `${DIRNAME} $@@` && ${LIBTOOL} ${CC} ${CFLAGS} $? d121 1 a121 1 + $(LIBTOOL) $(CC) -o `$(BASENAME) $@@` \ d131 1 a131 1 + $(LIBTOOL) $(LD) $(LFLAGS) -o `$(BASENAME) $@@` \ d158 1 a158 1 + ${LIBTOOL} ${BSD_INSTALL_PROGRAM} $? $(TOAST_INSTALL_BIN) d212 1 a212 1 + ${LIBTOOL} ${BSD_INSTALL_DATA} $? $(GSM_INSTALL_LIB) @ 1.5 log @Add NetBSD RCS Ids. @ text @d4 1 a4 1 +++ Makefile Mon Mar 16 02:32:43 1998 d10 2 a11 2 +#MULHACK = -DUSE_FLOAT_MUL # Don't define it for FreeBSD, cause SIGFPE +MULHACK = d16 2 a17 2 +#FAST = -DFAST +FAST = d21 1 a21 1 @@@@ -43,8 +45,8 @@@@ d26 2 a27 3 -CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 +#CC = gcc -ansi -pedantic +CCFLAGS = -c -DNeedFunctionPrototypes=1 d30 1 a30 10 @@@@ -59,6 +61,7 @@@@ ######### 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 @@@@ -71,7 +74,7 @@@@ d35 1 a35 1 +INSTALL_ROOT = $(PREFIX) d39 1 a39 1 @@@@ -80,7 +83,7 @@@@ d48 1 a48 1 @@@@ -96,7 +99,7 @@@@ d55 1 d58 11 a68 1 @@@@ -129,17 +132,19 @@@@ d73 1 a73 1 +CFLAGS += $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \ d77 1 a77 4 LFLAGS = $(LDFLAGS) $(LDINC) ######### It's $(LD) $(LFLAGS) +.SUFFIXES: .c .so .o d81 2 a82 2 LIBGSM = $(LIB)/libgsm.a +LIBGSM_SHARED = $(LIB)/libgsm.so.1.0.10 d86 2 a87 1 @@@@ -258,6 +263,7 @@@@ d90 2 a91 2 $(GSM_INSTALL_LIB)/libgsm.a \ + $(GSM_INSTALL_LIB)/libgsm.so.1.0.10 \ d95 7 a101 1 @@@@ -277,9 +283,12 @@@@ d105 2 a106 2 +.c.so: + ${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} d110 15 a124 13 -all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST) +all: $(LIBGSM) $(LIBGSM_SHARED) $(TOAST) $(TCAT) $(UNTOAST) @@-echo $(ROOT): Done. tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result @@@@ -304,11 +313,15 @@@@ $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) $(RANLIB) $(LIBGSM) +$(LIBGSM_SHARED): $(LIB) $(GSM_OBJECTS:S/o$/so/g) + -rm $(RMFLAGS) $(LIBGSM_SHARED) + ld -Bshareable -o $(LIBGSM_SHARED) $(GSM_OBJECTS:S/o$/so/g) + d130 3 a132 1 + $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) -lgsm $(LDLIB) d136 1 a136 1 @@@@ -332,12 +345,14 @@@@ d141 1 a141 2 + make INSTALL_ROOT=$(INSTALL_ROOT) \ + $(GSM_INSTALL_TARGETS); \ d147 1 a147 2 + make INSTALL_ROOT=$(INSTALL_ROOT) \ + $(TOAST_INSTALL_TARGETS); \ d151 8 a158 1 @@@@ -357,11 +372,11 @@@@ d161 1 a161 1 -rm $@@ d163 1 a163 1 + cd $(TOAST_INSTALL_BIN) && $(LN) toast $@@ d166 1 a166 1 -rm $@@ d168 1 a168 1 + cd $(TOAST_INSTALL_BIN) && $(LN) toast $@@ d171 39 a209 6 -rm $@@ @@@@ -397,6 +412,12 @@@@ -rm $@@ cp $? $@@ chmod 444 $@@ + ranlib $@@ d211 2 a212 4 +$(GSM_INSTALL_LIB)/libgsm.so.1.0.10: $(LIBGSM_SHARED) + -rm $@@ + cp $? $@@ + chmod 444 $@@ a215 19 @@@@ -416,7 +437,7 @@@@ @@-echo uninstall: Done. semi-clean: - -rm $(RMFLAGS) */*.o \ + -rm $(RMFLAGS) */*.o */*.so \ $(TST)/lin2cod $(TST)/lin2txt \ $(TST)/cod2lin $(TST)/cod2txt \ $(TST)/gsm2cod \ @@@@ -425,7 +446,8 @@@@ -print | xargs rm $(RMFLAGS) clean: semi-clean - -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \ + -rm $(RMFLAGS) $(LIBGSM) $(LIBGSM_SHARED) \ + $(ADDTST)/add \ $(TOAST) $(TCAT) $(UNTOAST) \ $(ROOT)/gsm-1.0.tar.Z @ 1.4 log @Clean this up a bit. @ text @d1 2 @ 1.3 log @Install toast, tcat and untoast using the correct mode. Thanks to is for pointing this out. @ text @d1 2 a2 2 --- Makefile.orig Tue Jul 2 15:36:06 1996 +++ Makefile Fri Nov 14 14:03:28 1997 d30 1 a30 1 @@@@ -59,11 +61,13 @@@@ d38 1 a38 7 ######### Additional libraries needed by $(LD) +PREFIX= /usr/local # Where do you want to install libraries, binaries, a header file # and the manual pages? @@@@ -71,7 +75,7 @@@@ d47 1 a47 1 @@@@ -80,7 +84,7 @@@@ d56 10 a65 1 @@@@ -129,13 +133,14 @@@@ d81 5 d104 1 a104 1 +all: $(LIBGSM) $(LIB)/libgsm.so.1.0.10 $(TOAST) $(TCAT) $(UNTOAST) d108 3 a110 1 @@@@ -299,6 +308,9 @@@@ d112 4 a115 1 # The basic API: libgsm a116 7 +$(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,7 +320,7 @@@@ d125 1 a125 2 @@@@ -331,14 +343,19 @@@@ # Installation d128 1 a128 1 - -if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \ d130 3 a132 8 - fi + ${INSTALL} -c -m 0644 lib/libgsm.a ${GSM_INSTALL_LIB} + ranlib ${GSM_INSTALL_LIB}/libgsm.a + ${INSTALL} -c -m 0644 lib/libgsm.so.1.0.10 ${GSM_INSTALL_LIB} + ${INSTALL} -c -m 0444 inc/gsm.h ${GSM_INSTALL_INC} + -for f in gsm.3 gsm_explode.3 gsm_option.3 gsm_print.3; do \ + ${INSTALL} -c -m 0644 man/$$f ${GSM_INSTALL_MAN}; \ + done d135 1 a135 1 - -if [ x"$(TOAST_INSTALL_ROOT)" != x ]; then \ d137 3 a139 5 - fi + -for f in toast tcat untoast; do \ + ${INSTALL} -c -m 0755 bin/$$f ${TOAST_INSTALL_BIN}; \ + done + ${INSTALL} -c -m 0644 man/toast.1 ${TOAST_INSTALL_MAN} d142 17 a158 2 -if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \ @@@@ -394,6 +411,12 @@@@ d160 3 a162 2 $(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM) d166 22 a187 6 + ranlib $@@ + +$(GSM_INSTALL_LIB)/libgsm.so.1.0.10: $(LIB)/libgsm.so.1.0.10 -rm $@@ cp $? $@@ chmod 444 $@@ @ 1.2 log @Revamp installation part of the Makefile, so that everything installs cleanly in appropriate directories, using native make. @ text @d139 1 a139 1 + ${INSTALL} -c -m 0644 bin/$$f ${TOAST_INSTALL_BIN}; \ @ 1.1 log @Initial revision @ text @d1 157 a157 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 $@@ @ 1.1.1.1 log @Initial import of FreeBSD audio packages. @ text @@