Update MD5 checksum:

* Author rearranged the Makefile (and recompiled the linked objects
  contained within the DISTFILE)

Update Makefile patch (patch-aa) to reflect the above changes

Add 'clean' to ALL_TARGET so we do not link with the author's precompiled
objects in the DISTFILE (FreeBSD's linker doesn't like Linux object
files).
This commit is contained in:
Chris D. Faulhaber 2000-04-16 12:56:58 +00:00
parent 4eb39f8af8
commit 29ca3dfb18
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=27656
3 changed files with 9 additions and 10 deletions

View file

@ -14,7 +14,7 @@ MAINTAINER= jedgar@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
ALL_TARGET= wmcalc
ALL_TARGET= clean wmcalc
USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/wmcalc

View file

@ -1 +1 @@
MD5 (wmcalc-0.1.tar.gz) = a4f5e639e115b2c20c8ee604cc0ce449
MD5 (wmcalc-0.1.tar.gz) = c0f814ee45eac22cf659ca3107f6b9a1

View file

@ -1,23 +1,22 @@
--- Makefile.orig Sat Nov 27 01:40:16 1999
+++ Makefile Tue Mar 28 22:21:05 2000
--- Makefile.orig Thu Apr 6 22:25:39 2000
+++ Makefile Sun Apr 16 08:50:18 2000
@@ -1,15 +1,15 @@
-INCLUDES =-I/usr/X11R6/include/X11 -I/usr/local/include -I/usr/include/X11R6/X11
-LIBINC =-L/usr/X11R6/lib -L/usr/include/lib
-LIBS = -lX11 -lXpm -lXext
+INCLUDES=-I${X11BASE}/include
+LIBINC=-L${X11BASE}/lib
+LIBS = -lX11 -lXpm -lXext -lm
+INCLUDES =-I${X11BASE}/include
+LIBINC =-L${X11BASE}/lib
LIBS = -lX11 -lXpm -lXext -lm
TARGET = wmcalc
OBJECTS = wmcalc.o readln.o wmcalcswitch.o wmcalcfunc.o
.c.o:
- gcc -O2 -c -Wall ${INCLUDES} ${FLAGS} $< -o $*.o
+ ${CC} ${CFLAGS} -c ${INCLUDES} ${FLAGS} $< -o $*.o
+ gcc ${CFLAGS} -c ${INCLUDES} ${FLAGS} $< -o $*.o
${TARGET}: ${OBJECTS}
- gcc -O2 -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS}
+ ${CC} ${CFLAGS} -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS}
+ gcc ${CFLAGS} -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS}
clean::
for i in ${OBJECTS}; do if [ -e $$i ] ; then rm $$i; fi; done