af591191d2
automatically by pthread.buildlink3.mk. Also, factor out the pthread library out of PTHREAD_LDFLAGS into a standalone variable PTHREAD_LIBS and use it in packages where necessary (usually the ones that don't have a GNU configure script).
38 lines
1.4 KiB
Text
38 lines
1.4 KiB
Text
$NetBSD: patch-aa,v 1.2 2004/11/12 06:39:20 jlam Exp $
|
|
|
|
--- Makefile.orig 2004-01-16 08:48:09.000000000 +0100
|
|
+++ Makefile
|
|
@@ -1,26 +1,27 @@
|
|
-INSTALLDIR = /usr/local/lib/gkrellm2/plugins
|
|
+INSTALLDIR = $(PREFIX)/lib/gkrellm2/plugins
|
|
VERSION = 2.0.8
|
|
PKGNAME = gkrellm-multiping
|
|
#OPT = -march=athlon -O2
|
|
#CC = gcc-3.0
|
|
-CC = gcc
|
|
+#CC = gcc
|
|
+CFLAGS+= -I$(BUILDLINK_DIR)/include
|
|
|
|
all: pinger multiping.so
|
|
|
|
pinger: pinger.c
|
|
- $(CC) `pkg-config glib-2.0 --cflags` $(OPT) -lpthread `pkg-config glib-2.0 --libs` -Wall -o pinger pinger.c
|
|
+ $(CC) $(CFLAGS) `pkg-config glib-2.0 --cflags` $(OPT) $(LDFLAGS) `pkg-config glib-2.0 --libs` -Wall -o pinger pinger.c
|
|
|
|
multiping.o: multiping.c decal_multiping_status.xpm
|
|
- $(CC) -Wall -fPIC -Wall `pkg-config gtk+-2.0 --cflags` $(OPT) -DVERSION=\"$(VERSION)\" -c multiping.c
|
|
+ $(CC) $(CFLAGS) -Wall -fPIC -Wall `pkg-config gtk+-2.0 --cflags` $(OPT) -DVERSION=\"$(VERSION)\" -c multiping.c
|
|
|
|
multiping.so: multiping.o
|
|
- $(CC) -shared -Wl -ggdb `pkg-config gtk+-2.0 --libs`-o multiping.so multiping.o
|
|
+ $(CC) $(LDFLAGS) -shared -Wl `pkg-config gtk+-2.0 --libs` -o multiping.so multiping.o
|
|
|
|
clean:
|
|
rm -f *.o *.so core
|
|
|
|
install: pinger multiping.so
|
|
- install -d $(INSTALLDIR)
|
|
+# install -d $(INSTALLDIR)
|
|
install -c -s -m 644 multiping.so $(INSTALLDIR)
|
|
install -c -s -m 4755 pinger $(INSTALLDIR)
|
|
echo "pinger helper is installed suid root"
|