diff options
| author | Jun Kuriyama <kuriyama@FreeBSD.org> | 1999-06-14 13:29:14 +0000 |
|---|---|---|
| committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 1999-06-14 13:29:14 +0000 |
| commit | ce44d21673ec9afeca4ca4fe9f7c04d174e6cd37 (patch) | |
| tree | 996fa27b26c8e1679da570700dad36ac141550ec /sysutils/wmmon/files/patch-aa | |
| parent | Fogot to copy two files (MJ700V2C.FAQ, gdevmjc.ps) for gdevmjc-0.8 (diff) | |
Fix to compile on -current (and others).
Change MAINTAINER to Stephen Kiernam <sk-ports@vegamuse.org>.
PR: ports/11880
Submitted by: Stephen Kiernam <sk-ports@vegamuse.org>
No response from: old maintainer
Diffstat (limited to 'sysutils/wmmon/files/patch-aa')
| -rw-r--r-- | sysutils/wmmon/files/patch-aa | 73 |
1 files changed, 47 insertions, 26 deletions
diff --git a/sysutils/wmmon/files/patch-aa b/sysutils/wmmon/files/patch-aa index 6241f6f596b1..cb023155c041 100644 --- a/sysutils/wmmon/files/patch-aa +++ b/sysutils/wmmon/files/patch-aa @@ -1,31 +1,52 @@ -*** ../../wmmon/Makefile.FreeBSD-3.0~ Thu Nov 12 18:39:57 1998 ---- ../../wmmon/Makefile.FreeBSD-3.0 Fri Jan 1 23:33:27 1999 +*** ../../wmmon.app/wmmon/Makefile.orig Tue May 19 17:13:16 1998 +--- ../../wmmon.app/wmmon/Makefile Mon May 24 21:38:45 1999 *************** -*** 3,9 **** - # - LIBDIR = -L/usr/X11R6/lib - LIBS = -lXpm -lXext -lX11 -lkvm -ldevstat -! CFLAGS = -g -Wall -I/usr/X11R6/include - OBJS = wmmon.o \ - ../wmgeneral/wmgeneral.o \ - ../wmgeneral/misc.o \ ---- 3,10 ---- - # - LIBDIR = -L/usr/X11R6/lib - LIBS = -lXpm -lXext -lX11 -lkvm -ldevstat +*** 1,19 **** +! LIBDIR = -L/usr/X11R6/lib +! LIBS = -lXpm -lXext -lX11 +! OBJS = wmmon.o \ +! ../wmgeneral/wmgeneral.o \ +! ../wmgeneral/misc.o \ +! ../wmgeneral/list.o +! + + .c.o: +! cc -c -O2 -Wall $< -o $*.o + +! wmmon: $(OBJS) +! cc -o wmmon $^ $(LIBDIR) $(LIBS) + + clean:: +! for i in $(OBJS) ; do \ +! rm $$i;\ +! done +! rm wmmon +--- 1,28 ---- +! # +! # Makefile for FreeBSD 3.x and 4.0 versions of wmmon +! # +! LIBDIR = -L/usr/X11R6/lib +! LIBS = -lXpm -lXext -lX11 -lkvm -ldevstat ! CFLAGS ?= -O2 ! CFLAGS += -g -Wall -I/usr/X11R6/include - OBJS = wmmon.o \ - ../wmgeneral/wmgeneral.o \ - ../wmgeneral/misc.o \ -*************** -*** 24,27 **** - rm -f $(PROG) +! OBJS = wmmon.o \ +! ../wmgeneral/wmgeneral.o \ +! ../wmgeneral/misc.o \ +! ../wmgeneral/list.o +! PROG = wmmon + + .c.o: +! ${CC} -c $(CFLAGS) $< -o $*.o +! +! $(PROG): $(OBJS) +! ${CC} -o $@ $> -lXext $(LIBDIR) $(LIBS) - install:: -! install -c -g kmem -m 4755 -o root $(PROG) /usr/X11R6/bin ---- 25,28 ---- - rm -f $(PROG) +! all:: $(PROG) - install:: -! install -c -g kmem -m 4755 -o root $(PROG) ${PREFIX}/bin + clean:: +! rm -f $(OBJS) +! rm -f $(PROG) +! +! install:: +! install -c -g kmem -m 2755 -o root $(PROG) ${PREFIX}/bin +! |