b2490555a3
from Brad, ok sthen@
75 lines
2.9 KiB
Plaintext
75 lines
2.9 KiB
Plaintext
$OpenBSD: patch-Makefile,v 1.1 2012/05/03 06:51:07 ajacoutot Exp $
|
|
--- Makefile.orig Wed Dec 31 03:43:03 2008
|
|
+++ Makefile Fri Dec 16 03:45:55 2011
|
|
@@ -16,7 +16,7 @@ CFLAGS += -DHAVE_CONFIG_H -DHAVE_DLFCN_H
|
|
L=libdvdread
|
|
DVDREAD_L=libdvdread
|
|
DVDREAD_LIB = $(DVDREAD_L).a
|
|
-DVDREAD_SHLIB = $(DVDREAD_L).so
|
|
+DVDREAD_SHLIB = $(DVDREAD_L).so.$(LIBDVDREAD_VERSION)
|
|
VPATH+= $(SRC_PATH_BARE)/src
|
|
DVDREAD_HEADERS = src/dvdread/dvd_reader.h \
|
|
src/dvdread/ifo_print.h \
|
|
@@ -47,13 +47,13 @@ DVDREAD_DEPS= ${DVDREAD_OBJS:%.o=%.d}
|
|
BUILDDEPS = Makefile config.mak
|
|
|
|
ifeq ($(BUILD_SHARED),yes)
|
|
-all: $(SHLIB) $(DVDREAD_SHLIB) dvdread-config pkgconfig
|
|
-install: $(SHLIB) $(DVDREAD_SHLIB) install-shared install-dvdread-config install-pkgconfig
|
|
+all: $(DVDREAD_SHLIB) dvdread-config pkgconfig
|
|
+install: $(DVDREAD_SHLIB) install-shared install-dvdread-config install-pkgconfig
|
|
endif
|
|
|
|
ifeq ($(BUILD_STATIC),yes)
|
|
-all: $(LIB) $(DVDREAD_LIB) dvdread-config pkgconfig
|
|
-install: $(LIB) $(DVDREAD_LIB) install-static install-dvdread-config install-pkgconfig
|
|
+all: $(DVDREAD_LIB) dvdread-config pkgconfig
|
|
+install: $(DVDREAD_LIB) install-static install-dvdread-config install-pkgconfig
|
|
endif
|
|
|
|
install: install-headers
|
|
@@ -78,7 +78,7 @@ ${DVDREAD_LIB}: version.h $(DVDREAD_OBJS) $(BUILDDEPS)
|
|
cd $(.OBJDIR) && $(RANLIB) $@
|
|
|
|
${DVDREAD_SHLIB}: version.h $(DVDREAD_SHOBJS) $(BUILDDEPS)
|
|
- cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) $(LDFLAGS) -ldl -Wl,-soname=$(DVDREAD_SHLIB).$(SHLIB_MAJOR) -o $@ $(DVDREAD_SHOBJS)
|
|
+ cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -fPIC $(LDFLAGS) -o $@ $(DVDREAD_SHOBJS)
|
|
|
|
.c.so: $(BUILDDEPS)
|
|
cd $(.OBJDIR) && $(CC) -fPIC -DPIC -MD $(CFLAGS) -c -o $@ $<
|
|
@@ -93,29 +93,16 @@ install-headers:
|
|
install -d $(DESTDIR)$(dvdread_incdir)
|
|
install -m 644 $(DVDREAD_HEADERS) $(DESTDIR)$(dvdread_incdir)
|
|
|
|
-install-shared: $(SHLIB)
|
|
+install-shared: $(DVDREAD_SHLIB)
|
|
install -d $(DESTDIR)$(shlibdir)
|
|
|
|
- install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(SHLIB) \
|
|
- $(DESTDIR)$(shlibdir)/$(SHLIB).$(SHLIB_VERSION)
|
|
+ install -m 755 $(.OBJDIR)/$(DVDREAD_SHLIB) \
|
|
+ $(DESTDIR)$(shlibdir)
|
|
|
|
- cd $(DESTDIR)$(shlibdir) && \
|
|
- ln -sf $(SHLIB).$(SHLIB_VERSION) $(SHLIB).$(SHLIB_MAJOR)
|
|
- cd $(DESTDIR)$(shlibdir) && \
|
|
- ln -sf $(SHLIB).$(SHLIB_MAJOR) $(SHLIB)
|
|
-
|
|
- install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(DVDREAD_SHLIB) \
|
|
- $(DESTDIR)$(shlibdir)/$(DVDREAD_SHLIB).$(SHLIB_VERSION)
|
|
- cd $(DESTDIR)$(shlibdir) && \
|
|
- ln -sf $(DVDREAD_SHLIB).$(SHLIB_VERSION) $(DVDREAD_SHLIB).$(SHLIB_MAJOR)
|
|
- cd $(DESTDIR)$(shlibdir) && \
|
|
- ln -sf $(DVDREAD_SHLIB).$(SHLIB_MAJOR) $(DVDREAD_SHLIB)
|
|
-
|
|
-install-static: $(LIB)
|
|
+install-static: $(DVDREAD_LIB)
|
|
install -d $(DESTDIR)$(libdir)
|
|
|
|
- install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(LIB) $(DESTDIR)$(libdir)/$(LIB)
|
|
- install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(DVDREAD_LIB) $(DESTDIR)$(libdir)/$(DVDREAD_LIB)
|
|
+ install -m 755 $(.OBJDIR)/$(DVDREAD_LIB) $(DESTDIR)$(libdir)/$(DVDREAD_LIB)
|
|
|
|
|
|
# Clean targets
|