Index: cdparanoia-III-10.2/interface/Makefile.in =================================================================== --- cdparanoia-III-10.2.orig/interface/Makefile.in +++ cdparanoia-III-10.2/interface/Makefile.in @@ -10,6 +10,7 @@ srcdir=@srcdir@ FLAGS=@SBPCD_H@ @UCDROM_H@ @TYPESIZES@ @CFLAGS@ OPT=@OPT@ $(FLAGS) DEBUG=@DEBUG@ -DCDDA_TEST +LIBFLAGS = -fPIC CC=@CC@ LD=@CC@ LDFLAGS=@LDFLAGS@ $(FLAGS) @@ -20,6 +21,8 @@ CPPFLAGS+=-D_REENTRANT OFILES = scan_devices.o common_interface.o cooked_interface.o interface.o\ scsi_interface.o smallft.o toc.o test_interface.o +LOFILES = scan_devices.lo common_interface.lo cooked_interface.lo interface.lo\ + scsi_interface.lo smallft.lo toc.lo test_interface.lo export VERSION @@ -32,8 +35,7 @@ lib: $(MAKE) libcdda_interface.a CFLAGS="$(OPT)" slib: - $(MAKE) lessmessy - $(MAKE) libcdda_interface.so CFLAGS="$(OPT) -fpic" + $(MAKE) libcdda_interface.so CFLAGS="$(OPT)" [ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so libcdda_interface.so.0 test: @@ -45,14 +47,17 @@ libcdda_interface.a: $(OFILES) $(AR) -r libcdda_interface.a $(OFILES) $(RANLIB) libcdda_interface.a -libcdda_interface.so: $(OFILES) - $(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS) +libcdda_interface.so: $(LOFILES) + $(CC) $(LDFLAGS) $(LIBFLAGS) -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(LOFILES) $(LIBS) [ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0 [ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so .c.o: $(CC) $(CFLAGS) -c $< +%.lo: %.c + $(CC) $(CFLAGS) $(LIBFLAGS) -c $< -o $@ + lessmessy: -rm -f *.o core *~ *.out Index: cdparanoia-III-10.2/paranoia/Makefile.in =================================================================== --- cdparanoia-III-10.2.orig/paranoia/Makefile.in +++ cdparanoia-III-10.2/paranoia/Makefile.in @@ -11,6 +11,7 @@ srcdir=@srcdir@ FLAGS=@TYPESIZES@ @CFLAGS@ OPT=@OPT@ $(FLAGS) DEBUG=@DEBUG@ +LIBFLAGS = -fPIC CC=@CC@ LD=@CC@ LDFLAGS=@LDFLAGS@ $(FLAGS) @@ -20,8 +21,9 @@ CPPFLAGS+=-D_REENTRANT OFILES = paranoia.o p_block.o overlap.o gap.o isort.o #TFILES = isort.t gap.t p_block.t paranoia.t +LOFILES = paranoia.lo p_block.lo overlap.lo gap.lo isort.lo -LIBS = ../interface/libcdda_interface.a -lm +LIBS = ../interface/libcdda_interface.so -lm export VERSION all: lib slib @@ -33,8 +35,7 @@ lib: $(MAKE) libcdda_paranoia.a CFLAGS="$(OPT)" slib: - $(MAKE) lessmessy - $(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fpic" + $(MAKE) libcdda_paranoia.so CFLAGS="$(OPT)" #test: $(TFILES) # @@ -43,14 +44,17 @@ libcdda_paranoia.a: $(OFILES) $(AR) -r libcdda_paranoia.a $(OFILES) $(RANLIB) libcdda_paranoia.a -libcdda_paranoia.so: $(OFILES) - $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface +libcdda_paranoia.so: $(LOFILES) + $(CC) $(LDFLAGS) $(LIBSFLAGS) -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(LOFILES) -L ../interface -lcdda_interface [ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0 [ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so .c.o: $(CC) $(CFLAGS) -c $< +%.lo: %.c + $(CC) $(CFLAGS) $(LIBFLAGS) -c $< -o $@ + .c.t: $(CC) -g -DTEST $(DEBUG) -o $@ $< $(LIBS) $@