9bc4bc08f9
cdda_device_name to struct cdrom_drive. This makes a number of hacks in various places superfluous and should fix the KDE multimedia issues. Bump revision. Recursive bump will follow, since the major version changed.
50 lines
1.5 KiB
Text
50 lines
1.5 KiB
Text
$NetBSD: patch-ba,v 1.3 2006/03/07 06:29:03 joerg Exp $
|
|
|
|
--- paranoia/Makefile.in.orig Tue Dec 14 04:28:04 1999
|
|
+++ paranoia/Makefile.in
|
|
@@ -21,10 +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
|
|
|
|
-LIBS = ../interface/libcdda_interface.a -lm
|
|
-export VERSION
|
|
+LIBS = ../interface/libcdda_interface.la -lm
|
|
|
|
-all: lib slib
|
|
+all: slib
|
|
|
|
debug:
|
|
$(MAKE) libcdda_paranoia.a CFLAGS="$(DEBUG)"
|
|
@@ -33,23 +32,21 @@ lib:
|
|
$(MAKE) libcdda_paranoia.a CFLAGS="$(OPT)"
|
|
|
|
slib:
|
|
- $(MAKE) lessmessy
|
|
- $(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fpic"
|
|
+ $(MAKE) libcdda_paranoia.so VERSION=$(VERSION) CFLAGS="$(OPT)"
|
|
|
|
#test: $(TFILES)
|
|
#
|
|
|
|
-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)
|
|
- [ -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
|
|
+libcdda_paranoia.la: $(OFILES)
|
|
+ $(LIBTOOL) --mode=link $(CC) -o libcdda_paranoia.la $(OFILES:.o=.lo) \
|
|
+ -version-info 1:0 -rpath $(PREFIX)/lib
|
|
+
|
|
+libcdda_paranoia.a: libcdda_paranoia.la
|
|
+
|
|
+libcdda_paranoia.so: libcdda_paranoia.la
|
|
|
|
.c.o:
|
|
- $(CC) $(CFLAGS) -c $<
|
|
+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
|
|
|
|
.c.t:
|
|
$(CC) -g -DTEST $(DEBUG) -o $@ $< $(LIBS)
|