- make use of MAKE_FLAGS
- re-do install target using BSD_INSTALL_ macros
This commit is contained in:
brad
parent
f3f61961b2
commit
22417a4694
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.8 2000/03/06 22:09:41 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.9 2000/03/23 06:51:58 brad Exp $
|
||||
# $FreeBSD: Makefile,v 1.5 1998/09/14 22:19:05 smace Exp $
|
||||
|
||||
DISTNAME= jbigkit-1.1
|
||||
@ -19,6 +19,8 @@ FAKE= Yes
|
||||
|
||||
NO_CONFIGURE= Yes
|
||||
|
||||
MAKE_FLAGS= CC="${CC}" CCFLAGS="${CFLAGS} -Wall"
|
||||
|
||||
WRKDIST= ${WRKDIR}/jbigkit
|
||||
|
||||
post-install:
|
||||
@ -26,7 +28,7 @@ post-install:
|
||||
${INSTALL_DATA} ${WRKSRC}/libjbig/jbig.doc ${PREFIX}/share/doc/jbig
|
||||
|
||||
test: build
|
||||
@cd ${WRKSRC} && env LD_LIBRARY_PATH="${WRKSRC}/libjbig" make test
|
||||
@cd ${WRKSRC} && env LD_LIBRARY_PATH="${WRKSRC}/libjbig" make ${MAKE_FLAGS} -f ${MAKE_FILE} test
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
|
||||
@ -1,23 +1,6 @@
|
||||
--- Makefile.orig Tue Nov 16 10:55:22 1999
|
||||
+++ Makefile Mon Dec 27 00:37:06 1999
|
||||
@@ -2,13 +2,14 @@
|
||||
# $Id: patch-aa,v 1.2 1999/12/27 06:12:09 brad Exp $
|
||||
|
||||
# Select an ANSI/ISO C compiler here, GNU gcc is recommended
|
||||
-CC = gcc
|
||||
+#CC = gcc
|
||||
|
||||
# Options for the compiler: A high optimization level is suggested
|
||||
CCFLAGS = -O2 -W
|
||||
#CCFLAGS = -O -g -W -Wall -ansi -pedantic #-DDEBUG # developer only
|
||||
|
||||
-CFLAGS = $(CCFLAGS) -I../libjbig
|
||||
+CFLAGS += -Wall -I../libjbig
|
||||
+
|
||||
|
||||
VERSION=1.1
|
||||
|
||||
@@ -16,7 +17,12 @@
|
||||
+++ Makefile Wed Mar 22 20:33:24 2000
|
||||
@@ -16,7 +16,12 @@
|
||||
@echo "Enter 'make test' in order to start some automatic tests."
|
||||
|
||||
lib:
|
||||
@ -31,25 +14,22 @@
|
||||
|
||||
pbm: lib
|
||||
(cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
|
||||
@@ -45,3 +51,21 @@
|
||||
@@ -45,3 +50,18 @@
|
||||
scp ANNOUNCE \
|
||||
$(DISTUID)@$(DISTHOST):$(DISTPATH)/jbigkit-$(VERSION)-announce.txt
|
||||
mv ../jbigkit-$(VERSION).tar.gz $(HOME)/.www/download/
|
||||
+
|
||||
+install:
|
||||
+ mkdir -p ${PREFIX}/bin
|
||||
+ mkdir -p ${PREFIX}/include
|
||||
+ mkdir -p ${PREFIX}/lib
|
||||
+ mkdir -p ${PREFIX}/man/man1
|
||||
+ mkdir -p ${PREFIX}/man/man5
|
||||
+ install -c -s -m 755 -o bin -g bin pbmtools/jbgtopbm ${PREFIX}/bin
|
||||
+ install -c -s -m 755 -o bin -g bin pbmtools/pbmtojbg ${PREFIX}/bin
|
||||
+ install -c -m 644 -o bin -g bin pbmtools/pbmtojbg.1 ${PREFIX}/man/man1
|
||||
+ install -c -m 644 -o bin -g bin pbmtools/jbgtopbm.1 ${PREFIX}/man/man1
|
||||
+ install -c -m 644 -o bin -g bin pbmtools/pbm.5 ${PREFIX}/man/man5
|
||||
+ install -c -m 644 -o bin -g bin pbmtools/pgm.5 ${PREFIX}/man/man5
|
||||
+ install -c -m 644 -o bin -g bin libjbig/jbig.h ${PREFIX}/include
|
||||
+ install -c -m 644 -o bin -g bin libjbig/libjbig.a ${PREFIX}/lib
|
||||
+ ${BSD_INSTALL_PROGRAM_DIR} ${PREFIX}/bin
|
||||
+ ${BSD_INSTALL_DATA_DIR} ${PREFIX}/include
|
||||
+ ${BSD_INSTALL_DATA_DIR} ${PREFIX}/lib
|
||||
+ ${BSD_INSTALL_MAN_DIR} ${PREFIX}/man/man1
|
||||
+ ${BSD_INSTALL_MAN_DIR} ${PREFIX}/man/man5
|
||||
+ cd pbmtools; ${BSD_INSTALL_PROGRAM} jbgtopbm pbmtojbg ${PREFIX}/bin; \
|
||||
+ ${BSD_INSTALL_MAN} jbgtopbm.1 pbmtojbg.1 ${PREFIX}/man/man1; \
|
||||
+ ${BSD_INSTALL_MAN} pbm.5 pgm.5 ${PREFIX}/man/man5
|
||||
+ ${BSD_INSTALL_DATA} libjbig/jbig.h ${PREFIX}/include
|
||||
+ ${BSD_INSTALL_DATA} libjbig/libjbig.a ${PREFIX}/lib
|
||||
+ @if [ -f libjbig/libjbig.so.$(VERSION) ]; then \
|
||||
+ install -c -m 644 -o bin -g bin libjbig/libjbig.so.$(VERSION) ${PREFIX}/lib;\
|
||||
+ ${BSD_INSTALL_DATA} libjbig/libjbig.so.$(VERSION) ${PREFIX}/lib;\
|
||||
+ fi
|
||||
|
||||
@ -1,23 +1,14 @@
|
||||
--- libjbig/Makefile.orig Fri Apr 10 21:33:27 1998
|
||||
+++ libjbig/Makefile Thu Dec 9 15:43:07 1999
|
||||
@@ -2,26 +2,47 @@
|
||||
# $Id: patch-ab,v 1.3 1999/12/27 06:12:09 brad Exp $
|
||||
|
||||
# Select an ANSI/ISO C compiler here, GNU gcc is recommended
|
||||
-CC = gcc
|
||||
+#CC = gcc
|
||||
|
||||
+++ libjbig/Makefile Wed Mar 22 20:31:42 2000
|
||||
@@ -7,21 +7,40 @@
|
||||
# Options for the compiler: A high optimization level is suggested
|
||||
-CFLAGS = -O -Wall -ansi -pedantic
|
||||
+#CFLAGS += -Wall -ansi -pedantic
|
||||
CFLAGS = -O -Wall -ansi -pedantic
|
||||
|
||||
-all: libjbig.a tstcodec
|
||||
+SOJBIGLIB=libjbig.so.$(VERSION)
|
||||
+
|
||||
+.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:U} == YES
|
||||
+all: libjbig.a
|
||||
+.else
|
||||
+all: libjbig.a $(SOJBIGLIB)
|
||||
+all: libjbig.a libjbig.so.$(VERSION)
|
||||
+.endif
|
||||
|
||||
tstcodec: tstcodec.c jbig.c jbig.h jbig_tab.o
|
||||
@ -32,7 +23,7 @@
|
||||
+ ar rc ${.TARGET} ${.ALLSRC}
|
||||
+ ranlib ${.TARGET}
|
||||
+
|
||||
+$(SOJBIGLIB): jbig.so jbig_tab.so
|
||||
+libjbig.so.$(VERSION): jbig.so jbig_tab.so
|
||||
+ rm -f ${.TARGET}
|
||||
+ ld -Bshareable -Bforcearchive -o ${.TARGET} ${.ALLSRC}
|
||||
+
|
||||
|
||||
@ -1,15 +1,6 @@
|
||||
--- pbmtools/Makefile.orig Wed Nov 4 05:00:44 1998
|
||||
+++ pbmtools/Makefile Mon Dec 27 00:38:08 1999
|
||||
@@ -2,14 +2,14 @@
|
||||
# $Id: patch-ac,v 1.2 1999/12/27 06:12:09 brad Exp $
|
||||
|
||||
# Select an ANSI/ISO C compiler here, e.g. GNU gcc is recommended
|
||||
-CC = gcc
|
||||
+#CC = gcc
|
||||
|
||||
# Options for the compiler
|
||||
-CFLAGS = -g -Wall -ansi -pedantic -I../libjbig
|
||||
+#CFLAGS = -g -Wall -ansi -pedantic -I../libjbig
|
||||
+++ pbmtools/Makefile Wed Mar 22 20:31:08 2000
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
.SUFFIXES: .1 .5 .txt $(SUFFIXES)
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user