claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

lib/Makefile.am (Nicolas Boullis):

Browse Source 
Mostly some cleanup... First, this tries to keep the versioning
separated from the rest of the Makefile. I used the "foo := $(foo)
bar" syntax rather than "foo += bar" as I think the += is not
available on all versions of make.

Moreover, I replaced "$(LIBCDIO_LIBS)" with "libcdio.la" as
"$(LIBCDIO_LIBS)" is "../lib/libcdio.la". That make a difference if you
try to build libiso9660.la while libcdio.la is not available. Make knows
how to make libcdio.la but not ../lib/libcdio.la.
This commit is contained in:
rocky
2004-02-11 03:09:43 +00:00
parent b87168a26b
commit 449490a736
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Makefile.am
View File

@@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.20 2004/02/10 01:38:54 rocky Exp $ # $Id: Makefile.am,v 1.21 2004/02/11 03:09:43 rocky Exp $
# #
# Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> # Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
# #
@@ -83,7 +83,7 @@ libcdio_sources = \
lib_LTLIBRARIES = libcdio.la libiso9660.la lib_LTLIBRARIES = libcdio.la libiso9660.la
libcdio_la_SOURCES = $(libcdio_sources) libcdio_la_SOURCES = $(libcdio_sources)
libcdio_la_LDFLAGS = -version-info $(libcdio_la_CURRENT):$(libcdio_la_REVISION):$(libcdio_la_AGE) -Wl,--version-script=libcdio.la.ver libcdio_la_ldflags = -version-info $(libcdio_la_CURRENT):$(libcdio_la_REVISION):$(libcdio_la_AGE)
libiso9660_la_SOURCES = \ libiso9660_la_SOURCES = \
iso9660.c \ iso9660.c \
@@ -91,8 +91,16 @@ libiso9660_la_SOURCES = \
iso9660_fs.c \ iso9660_fs.c \
xa.c xa.c
libiso9660_la_LIBADD = $(LIBCDIO_LIBS) libiso9660_la_LIBADD = libcdio.la
libiso9660_la_LDFLAGS = -version-info $(libiso9660_la_CURRENT):$(libiso9660_la_REVISION):$(libiso9660_la_AGE) -Wl,--version-script=libiso9660.la.ver libiso9660_la_ldflags = -version-info $(libiso9660_la_CURRENT):$(libiso9660_la_REVISION):$(libiso9660_la_AGE)
INCLUDES = -I$(LIBCDIO_CFLAGS)
MOSTLYCLEANFILES := $(MOSTLYCLEANFILES) libcdio.la.ver libiso9660.la.ver
########################################################
# Things to version the symbols in the libraries
########################################################
# An explanation of the versioning problem from Nicolas Boullis and # An explanation of the versioning problem from Nicolas Boullis and
# the versioned symbol solution he uses below... # the versioned symbol solution he uses below...
@@ -149,7 +157,8 @@ libiso9660_la_LDFLAGS = -version-info $(libiso9660_la_CURRENT):$(libiso9660_la_R
# command comes from libtool.) # command comes from libtool.)
libcdio_la_MAJOR := $(shell expr $(libcdio_la_CURRENT) - $(libcdio_la_AGE)) libcdio_la_MAJOR := $(shell expr $(libcdio_la_CURRENT) - $(libcdio_la_AGE))
libcdio_la_DEPENDENCIES = libcdio.la.ver libcdio_la_LDFLAGS := $(libcdio_la_ldflags) -Wl,--version-script=libcdio.la.ver
libcdio_la_DEPENDENCIES := $(libcdio_la_DEPENDENCIES) libcdio.la.ver
libcdio.la.ver: $(libcdio_la_OBJECTS) libcdio.la.ver: $(libcdio_la_OBJECTS)
echo 'CDIO_$(libcdio_la_MAJOR) { ' > $@ echo 'CDIO_$(libcdio_la_MAJOR) { ' > $@
@@ -158,14 +167,11 @@ libcdio.la.ver: $(libcdio_la_OBJECTS)
echo '};' >> $@ echo '};' >> $@
libiso9660_la_MAJOR := $(shell expr $(libiso9660_la_CURRENT) - $(libiso9660_la_AGE)) libiso9660_la_MAJOR := $(shell expr $(libiso9660_la_CURRENT) - $(libiso9660_la_AGE))
libiso9660_la_DEPENDENCIES = $(LIBCDIO_LIBS) libiso9660.la.ver libiso9660_la_LDFLAGS := $(libiso9660_la_ldflags) -Wl,--version-script=libiso9660.la.ver
libiso9660_la_DEPENDENCIES := libcdio.la libiso9660.la.ver
libiso9660.la.ver: $(libiso9660_la_OBJECTS) libiso9660.la.ver: $(libiso9660_la_OBJECTS)
echo 'ISO9660_$(libiso9660_la_MAJOR) {' > $@ echo 'ISO9660_$(libiso9660_la_MAJOR) {' > $@
echo " global:" >> $@ echo " global:" >> $@
nm $(patsubst %lo,%o,$(libiso9660_la_OBJECTS)) | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/ \1;/p' | sort | uniq >> $@ nm $(patsubst %lo,%o,$(libiso9660_la_OBJECTS)) | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/ \1;/p' | sort | uniq >> $@
echo '};' >> $@ echo '};' >> $@
MOSTLYCLEANFILES = libcdio.la.ver libiso9660.la.ver
INCLUDES = -I$(LIBCDIO_CFLAGS)