Fix parallel build problem

(upstream svn revision r192)
This commit is contained in:
dcoppa 2012-11-19 14:56:58 +00:00
parent 40d8555822
commit 921886ba9e
3 changed files with 43 additions and 1 deletions

View File

@ -1,7 +1,8 @@
# $OpenBSD: Makefile,v 1.12 2012/10/31 13:21:07 dcoppa Exp $
# $OpenBSD: Makefile,v 1.13 2012/11/19 14:56:58 dcoppa Exp $
COMMENT = gnome-mplayer toolkit
DISTNAME = gmtk-1.0.7
REVISION = 0
SHARED_LIBS = gmlib 1.0 \
gmtk 1.0

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_Makefile_am,v 1.1 2012/11/19 14:56:58 dcoppa Exp $
Fix parallel build problem (upstream svn revision r192)
--- src/Makefile.am.orig Mon Nov 19 15:40:18 2012
+++ src/Makefile.am Mon Nov 19 15:40:37 2012
@@ -38,7 +38,7 @@ libgmtk_la_LDFLAGS = -L.libs \
$(AM_LDFLAGS)
libgmtk_la_LIBADD = \
- -lgmlib \
+ libgmlib.la \
$(GTK_LIBS) \
$(ALSA_LIBS) \
$(PULSE_LIBS)

View File

@ -0,0 +1,26 @@
$OpenBSD: patch-src_Makefile_in,v 1.3 2012/11/19 14:56:58 dcoppa Exp $
Fix parallel build problem (upstream svn revision r192)
--- src/Makefile.in.orig Mon Nov 19 15:40:23 2012
+++ src/Makefile.in Mon Nov 19 15:49:25 2012
@@ -113,8 +113,8 @@ am__v_lt_0 = --silent
libgmlib_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgmlib_la_CFLAGS) \
$(CFLAGS) $(libgmlib_la_LDFLAGS) $(LDFLAGS) -o $@
-libgmtk_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
+libgmtk_la_DEPENDENCIES = libgmlib.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_libgmtk_la_OBJECTS = libgmtk_la-gmtk_common.lo \
libgmtk_la-gmtk_audio_meter.lo libgmtk_la-gmtk_media_player.lo \
libgmtk_la-gmtk_media_tracker.lo \
@@ -398,7 +398,7 @@ libgmtk_la_LDFLAGS = -L.libs \
$(AM_LDFLAGS)
libgmtk_la_LIBADD = \
- -lgmlib \
+ libgmlib.la \
$(GTK_LIBS) \
$(ALSA_LIBS) \
$(PULSE_LIBS)