Strongly buildlink'ify.

This commit is contained in:
jlam 2001-12-05 04:02:24 +00:00
parent 1aef1825b8
commit 390e465d2b
3 changed files with 27 additions and 16 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2001/02/16 15:11:01 wiz Exp $
# $NetBSD: Makefile,v 1.4 2001/12/05 04:02:24 jlam Exp $
#
DISTNAME= xbreaky-0.0.4
@ -9,7 +9,10 @@ MAINTAINER= rh@netbsd.org
HOMEPAGE= http://xbreaky.sourceforge.net/
COMMENT= breakout game for X11
USE_X11BASE= yes
USE_XPM= yes
USE_BUILDLINK_ONLY= YES
USE_X11BASE= YES
.include "../../graphics/xpm/buildlink.mk"
.include "../../mk/ossaudio.buildlink.mk"
.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.2 2001/04/21 02:08:38 wiz Exp $
$NetBSD: distinfo,v 1.3 2001/12/05 04:02:24 jlam Exp $
SHA1 (xbreaky-0.0.4.tar.gz) = efd3a2561b7d5f9a6788539b17c7fc2ead867350
Size (xbreaky-0.0.4.tar.gz) = 31277 bytes
SHA1 (patch-aa) = ec5a03b7e9536847ad1e80b130297e66d5f12e6a
SHA1 (patch-aa) = 6bddeb6fd674ddd9b709d0d78b623d3279be9c81
SHA1 (patch-ab) = 0ea22ce8cad38cecd615a0f8fe11de948426601c
SHA1 (patch-ac) = 11a19443637b09a00ea02496a698c880aba9c9d0

View file

@ -1,26 +1,34 @@
$NetBSD: patch-aa,v 1.1.1.1 2000/10/15 18:04:19 rh Exp $
$NetBSD: patch-aa,v 1.2 2001/12/05 04:02:25 jlam Exp $
--- Makefile.orig Thu May 11 09:53:15 2000
--- Makefile.orig Thu May 11 03:53:15 2000
+++ Makefile
@@ -4,9 +4,9 @@
CC=g++
GC=gcc
@@ -1,36 +1,36 @@
# Makefile for Xbreaky from {davebrul@hotmail.com}
-CC=g++
-GC=gcc
+#CXX=g++
+#CC=gcc
-CFLAGS = -O2 -DPREFIX=\"${prefix}\"
-LDFLAGS = -L/usr/X11R6/lib -I/usr/X11/include/X11 -lX11 -lXpm -lm
-prefix = /usr/local
+prefix?=${PREFIX}
+CFLAGS+= -DPREFIX=\"${prefix}\" -I${X11BASE}/include
+LDFLAGS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lX11 -lXpm -lm
+prefix ?= ${PREFIX}
+CFLAGS += -DPREFIX=\"${prefix}\"
+LDFLAGS += -lX11 -lXpm -lm
all: xbreaky xbreaky.snd
@@ -15,22 +15,22 @@
$(CC) $(LDFLAGS) xbreaky.o -o xbreaky
xbreaky:
- $(CC) $(CFLAGS) -c xbreaky.cpp -o xbreaky.o
- $(CC) $(LDFLAGS) xbreaky.o -o xbreaky
+ $(CXX) $(CFLAGS) -c xbreaky.cpp -o xbreaky.o
+ $(CXX) $(LDFLAGS) xbreaky.o -o xbreaky
xbreaky.snd:
- $(GC) $(CFLAGS) -lm -o xbreaky.snd xbreaky.snd.c
+ $(GC) $(CFLAGS) -lm -o xbreaky.snd xbreaky.snd.c -lossaudio
+ $(CC) $(CFLAGS) -lm -o xbreaky.snd xbreaky.snd.c ${LIBOSSAUDIO}
install:
for d in $(prefix)/bin $(prefix)/share/pixmaps $(prefix)/man/man6 \