remove NO_SHARED_LIBS

This commit is contained in:
naddy 2016-03-11 15:26:45 +00:00
parent e8ede514b9
commit 2339660906
2 changed files with 5 additions and 29 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.27 2015/05/02 09:42:43 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.28 2016/03/11 15:26:45 naddy Exp $
COMMENT= CDDA reading utility with extra data verification features
@ -32,8 +32,3 @@ post-install:
${INSTALL_DATA} ${WRKBUILD}/FAQ.txt ${PREFIX}/share/doc/cdparanoia
.include <bsd.port.mk>
.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:L} != "no"
ALL_TARGET= static
INSTALL_TARGET= sinstall
.endif

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.7 2005/12/23 15:03:06 espie Exp $
$OpenBSD: patch-Makefile_in,v 1.8 2016/03/11 15:26:45 naddy Exp $
--- Makefile.in.orig Wed Mar 28 00:46:58 2001
+++ Makefile.in Fri Dec 23 15:40:44 2005
@@ -23,33 +23,33 @@ BINDIR=@bindir@
+++ Makefile.in Fri Mar 11 16:13:56 2016
@@ -23,33 +23,28 @@ BINDIR=@bindir@
MANDIR=@mandir@
INCLUDEDIR=@includedir@
LIBDIR=@libdir@
@ -38,11 +38,6 @@ $OpenBSD: patch-Makefile_in,v 1.7 2005/12/23 15:03:06 espie Exp $
+ $(MAKE) cdparanoia CFLAGS="$(OPT)" LIBS="$(SHLIBS)" LIBDEP="$(SHLIBDEP)"
-debug:
+static:
+ cd interface && $(MAKE) lib
+ cd paranoia && $(MAKE) lib
+ $(MAKE) cdparanoia CFLAGS="$(OPT)" LIBS="$(STLIBS)" LIBDEP="$(STLIBDEP)"
+
+debug:
cd interface && $(MAKE) debug
cd paranoia && $(MAKE) debug
@ -51,7 +46,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2005/12/23 15:03:06 espie Exp $
test:
cd interface && $(MAKE) all
@@ -64,28 +64,34 @@ slib:
@@ -64,28 +59,20 @@ slib:
cd paranoia && $(MAKE) slib
install:
@ -90,20 +85,6 @@ $OpenBSD: patch-Makefile_in,v 1.7 2005/12/23 15:03:06 espie Exp $
+ $(INSTALL) -m 0644 $(srcdir)/interface/cdda_interface.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.so.$(LIBcdda_interface_VERSION) $(DESTDIR)$(LIBDIR)
+ $(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.a $(DESTDIR)$(LIBDIR)
+ $(INSTALL) -m 0644 $(srcdir)/utils.h $(DESTDIR)$(INCLUDEDIR)
+
+sinstall:
+ $(INSTALL) -d -m 0755 $(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 0755 $(srcdir)/cdparanoia $(DESTDIR)$(BINDIR)
+ $(INSTALL) -d -m 0755 $(DESTDIR)$(MANDIR)
+ $(INSTALL) -d -m 0755 $(DESTDIR)$(MANDIR)/man1
+ $(INSTALL) -m 0644 $(srcdir)/cdparanoia.1 $(DESTDIR)$(MANDIR)/man1
+ $(INSTALL) -d -m 0755 $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL) -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR)
+ $(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.a $(DESTDIR)$(LIBDIR)
+ $(INSTALL) -m 0644 $(srcdir)/interface/cdda_interface.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.a $(DESTDIR)$(LIBDIR)
+ $(INSTALL) -m 0644 $(srcdir)/utils.h $(DESTDIR)$(INCLUDEDIR)
cdparanoia: $(OFILES) $(LIBDEP)