- honor CFLAGS.

- new png.h header path.
from naddy@
This commit is contained in:
wcobb 2002-08-15 18:41:36 +00:00
parent 71b4a8db13
commit 61ccb4d775
2 changed files with 13 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2002/08/07 18:31:33 wcobb Exp $
# $OpenBSD: Makefile,v 1.3 2002/08/15 18:41:36 wcobb Exp $
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
@ -29,6 +29,7 @@ MAKE_FILE= makefile
ALL_TARGET= vislib
NO_REGRESS= Yes
CFLAGS+= -I${LOCALBASE}/include/libpng
MAKE_FLAGS= CC="${CC}"
MTREE_FILE= ${FILESDIR}/mtree

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-makefile,v 1.1.1.1 2002/07/30 17:23:24 wcobb Exp $
$OpenBSD: patch-makefile,v 1.2 2002/08/15 18:41:36 wcobb Exp $
--- makefile.orig Tue Dec 5 00:36:20 2000
+++ makefile Tue Jul 30 01:14:49 2002
@@ -6,6 +6,7 @@
+++ makefile Tue Aug 13 13:54:35 2002
@@ -6,12 +6,13 @@
# Set these for your systems locations.
# xmmsdir=/usr/local/share/xmms
# xmmsvislib=/usr/local/lib/xmms/Visualization
@ -9,6 +9,14 @@ $OpenBSD: patch-makefile,v 1.1.1.1 2002/07/30 17:23:24 wcobb Exp $
xmmsdir=`xmms-config --data-dir`
xmmsvislib=`xmms-config --visualization-plugin-dir`
-CFLAGS=-O2 -Wall -DHAVE_LIBPNG -DXMMS_DIR=\"$(xmmsdir)\" -DKJSKIN=\"$(xmmsdir)/kjofol/default.zip\" -I. `xmms-config --cflags`
+CFLAGS+=-Wall -DHAVE_LIBPNG -DXMMS_DIR=\"$(xmmsdir)\" -DKJSKIN=\"$(xmmsdir)/kjofol/default.zip\" -I. `xmms-config --cflags`
LPNG = -lpng -lz
-LDFLAGS=-O2
+LDFLAGS?=
# LIBS=-L/usr/lib `gtk-config --libs` $(LPNG) -lgthread -lpthread -lxmms -Wl,--rpath -Wl,/usr/local/lib
LIBS=`xmms-config --libs` $(LPNG)
OBJS=kj.o resource.o config.o image.o playlist.o
@@ -36,13 +37,11 @@ dist: clean
vislib:
make VFLAGS=-DXMMS_VIS=1 VLDFLAGS=-shared