Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/cdparanoia/patches/cdparanoia-3.10.2-Makefile.in.patch

    Contents of /trunk/cdparanoia/patches/cdparanoia-3.10.2-Makefile.in.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 799 - (show annotations) (download)
    Mon May 11 17:25:48 2009 UTC (15 years ago) by niro
    File size: 3559 byte(s) 
    patches for 3.10.2
    1 Index: cdparanoia-III-10.2/interface/Makefile.in
    2 ===================================================================
    3 --- cdparanoia-III-10.2.orig/interface/Makefile.in
    4 +++ cdparanoia-III-10.2/interface/Makefile.in
    5 @@ -10,6 +10,7 @@ srcdir=@srcdir@
    6 FLAGS=@SBPCD_H@ @UCDROM_H@ @TYPESIZES@ @CFLAGS@
    7 OPT=@OPT@ $(FLAGS)
    8 DEBUG=@DEBUG@ -DCDDA_TEST
    9 +LIBFLAGS = -fPIC
    10 CC=@CC@
    11 LD=@CC@
    12 LDFLAGS=@LDFLAGS@ $(FLAGS)
    13 @@ -20,6 +21,8 @@ CPPFLAGS+=-D_REENTRANT
    14
    15 OFILES = scan_devices.o common_interface.o cooked_interface.o interface.o\
    16 scsi_interface.o smallft.o toc.o test_interface.o
    17 +LOFILES = scan_devices.lo common_interface.lo cooked_interface.lo interface.lo\
    18 + scsi_interface.lo smallft.lo toc.lo test_interface.lo
    19
    20 export VERSION
    21
    22 @@ -32,8 +35,7 @@ lib:
    23 $(MAKE) libcdda_interface.a CFLAGS="$(OPT)"
    24
    25 slib:
    26 - $(MAKE) lessmessy
    27 - $(MAKE) libcdda_interface.so CFLAGS="$(OPT) -fpic"
    28 + $(MAKE) libcdda_interface.so CFLAGS="$(OPT)"
    29 [ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so libcdda_interface.so.0
    30
    31 test:
    32 @@ -45,14 +47,17 @@ libcdda_interface.a: $(OFILES)
    33 $(AR) -r libcdda_interface.a $(OFILES)
    34 $(RANLIB) libcdda_interface.a
    35
    36 -libcdda_interface.so: $(OFILES)
    37 - $(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS)
    38 +libcdda_interface.so: $(LOFILES)
    39 + $(CC) $(LDFLAGS) $(LIBFLAGS) -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(LOFILES) $(LIBS)
    40 [ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0
    41 [ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so
    42
    43 .c.o:
    44 $(CC) $(CFLAGS) -c $<
    45
    46 +%.lo: %.c
    47 + $(CC) $(CFLAGS) $(LIBFLAGS) -c $< -o $@
    48 +
    49 lessmessy:
    50 -rm -f *.o core *~ *.out
    51
    52 Index: cdparanoia-III-10.2/paranoia/Makefile.in
    53 ===================================================================
    54 --- cdparanoia-III-10.2.orig/paranoia/Makefile.in
    55 +++ cdparanoia-III-10.2/paranoia/Makefile.in
    56 @@ -11,6 +11,7 @@ srcdir=@srcdir@
    57 FLAGS=@TYPESIZES@ @CFLAGS@
    58 OPT=@OPT@ $(FLAGS)
    59 DEBUG=@DEBUG@
    60 +LIBFLAGS = -fPIC
    61 CC=@CC@
    62 LD=@CC@
    63 LDFLAGS=@LDFLAGS@ $(FLAGS)
    64 @@ -20,8 +21,9 @@ CPPFLAGS+=-D_REENTRANT
    65
    66 OFILES = paranoia.o p_block.o overlap.o gap.o isort.o
    67 #TFILES = isort.t gap.t p_block.t paranoia.t
    68 +LOFILES = paranoia.lo p_block.lo overlap.lo gap.lo isort.lo
    69
    70 -LIBS = ../interface/libcdda_interface.a -lm
    71 +LIBS = ../interface/libcdda_interface.so -lm
    72 export VERSION
    73
    74 all: lib slib
    75 @@ -33,8 +35,7 @@ lib:
    76 $(MAKE) libcdda_paranoia.a CFLAGS="$(OPT)"
    77
    78 slib:
    79 - $(MAKE) lessmessy
    80 - $(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fpic"
    81 + $(MAKE) libcdda_paranoia.so CFLAGS="$(OPT)"
    82
    83 #test: $(TFILES)
    84 #
    85 @@ -43,14 +44,17 @@ libcdda_paranoia.a: $(OFILES)
    86 $(AR) -r libcdda_paranoia.a $(OFILES)
    87 $(RANLIB) libcdda_paranoia.a
    88
    89 -libcdda_paranoia.so: $(OFILES)
    90 - $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
    91 +libcdda_paranoia.so: $(LOFILES)
    92 + $(CC) $(LDFLAGS) $(LIBSFLAGS) -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(LOFILES) -L ../interface -lcdda_interface
    93 [ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0
    94 [ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so
    95
    96 .c.o:
    97 $(CC) $(CFLAGS) -c $<
    98
    99 +%.lo: %.c
    100 + $(CC) $(CFLAGS) $(LIBFLAGS) -c $< -o $@
    101 +
    102 .c.t:
    103 $(CC) -g -DTEST $(DEBUG) -o $@ $< $(LIBS)
    104 $@