mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-25 21:07:40 +00:00
Fix building problems on a.out systems
clean up Makefiles a bit
This commit is contained in:
Scott Mace
parent
6e7a1bff7a
commit
77e18edfda
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=13178
@ -1,54 +1,80 @@
|
||||
--- Makefile.orig Fri Apr 10 20:34:54 1998
|
||||
+++ Makefile Mon Sep 14 16:45:26 1998
|
||||
@@ -2,13 +2,14 @@
|
||||
# $Id: Makefile,v 1.5 1998-04-11 02:34:53+01 mgk25 Rel $
|
||||
|
||||
# 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 = -O2 -W
|
||||
#CCFLAGS = -O -g -W -Wall -ansi -pedantic #-DDEBUG # developer only
|
||||
|
||||
-CFLAGS = $(CCFLAGS) -I../libjbig
|
||||
+CFLAGS += -I../libjbig
|
||||
+
|
||||
|
||||
all: lib pbm
|
||||
@echo "Enter 'make test' in order to start some automatic tests."
|
||||
@@ -19,9 +20,9 @@
|
||||
pbm: lib
|
||||
(cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
|
||||
|
||||
-test:
|
||||
- (cd libjbig; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
|
||||
- (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
|
||||
+#test:
|
||||
+# (cd libjbig; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
|
||||
+# (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
|
||||
|
||||
clean:
|
||||
rm -f *~ core
|
||||
@@ -31,3 +32,20 @@
|
||||
distribution: clean
|
||||
rm -f libjbig/libjbig.a
|
||||
(cd ..; tar -c -v --exclude RCS -f jbigkit.tar jbigkit)
|
||||
+
|
||||
+install:
|
||||
+ mkdir -p ${PREFIX}/bin
|
||||
+ 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
|
||||
+ mkdir -p ${PREFIX}/man/man1
|
||||
+ 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
|
||||
+ mkdir -p ${PREFIX}/man/man5
|
||||
+ 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
|
||||
+ mkdir -p ${PREFIX}/include
|
||||
+ install -c -m 644 -o bin -g bin libjbig/jbig.h ${PREFIX}/include
|
||||
+ mkdir -p ${PREFIX}/lib
|
||||
+ install -c -m 644 -o bin -g bin libjbig/libjbig.a ${PREFIX}/lib
|
||||
+ install -c -m 644 -o bin -g bin libjbig/libjbig.so.1 ${PREFIX}/lib
|
||||
+ (cd ${PREFIX}/lib; ln -sf libjbig.so.1 libjbig.so)
|
||||
*** Makefile.orig Fri Apr 10 20:34:54 1998
|
||||
--- Makefile Wed Sep 16 09:09:47 1998
|
||||
***************
|
||||
*** 2,14 ****
|
||||
# $Id: Makefile,v 1.5 1998-04-11 02:34:53+01 mgk25 Rel $
|
||||
|
||||
# Select an ANSI/ISO C compiler here, GNU gcc is recommended
|
||||
! 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
|
||||
|
||||
all: lib pbm
|
||||
@echo "Enter 'make test' in order to start some automatic tests."
|
||||
--- 2,15 ----
|
||||
# $Id: Makefile,v 1.5 1998-04-11 02:34:53+01 mgk25 Rel $
|
||||
|
||||
# Select an ANSI/ISO C compiler here, GNU gcc is recommended
|
||||
! #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 += -I../libjbig
|
||||
!
|
||||
|
||||
all: lib pbm
|
||||
@echo "Enter 'make test' in order to start some automatic tests."
|
||||
***************
|
||||
*** 19,27 ****
|
||||
pbm: lib
|
||||
(cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
|
||||
|
||||
! test:
|
||||
! (cd libjbig; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
|
||||
! (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
|
||||
|
||||
clean:
|
||||
rm -f *~ core
|
||||
--- 20,28 ----
|
||||
pbm: lib
|
||||
(cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
|
||||
|
||||
! #test:
|
||||
! # (cd libjbig; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
|
||||
! # (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
|
||||
|
||||
clean:
|
||||
rm -f *~ core
|
||||
***************
|
||||
*** 31,33 ****
|
||||
--- 32,55 ----
|
||||
distribution: clean
|
||||
rm -f libjbig/libjbig.a
|
||||
(cd ..; tar -c -v --exclude RCS -f jbigkit.tar jbigkit)
|
||||
+
|
||||
+ install:
|
||||
+ mkdir -p ${PREFIX}/bin
|
||||
+ 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
|
||||
+ mkdir -p ${PREFIX}/man/man1
|
||||
+ 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
|
||||
+ mkdir -p ${PREFIX}/man/man5
|
||||
+ 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
|
||||
+ mkdir -p ${PREFIX}/include
|
||||
+ install -c -m 644 -o bin -g bin libjbig/jbig.h ${PREFIX}/include
|
||||
+ mkdir -p ${PREFIX}/lib
|
||||
+ install -c -m 644 -o bin -g bin libjbig/libjbig.a ${PREFIX}/lib
|
||||
+ .if ${PORTOBJFORMAT} == elf
|
||||
+ install -c -m 644 -o bin -g bin libjbig/libjbig.so.1 ${PREFIX}/lib
|
||||
+ (cd ${PREFIX}/lib; ln -sf libjbig.so.1 libjbig.so)
|
||||
+ .else
|
||||
+ install -c -m 644 -o bin -g bin libjbig/libjbig.so.1.0 ${PREFIX}/lib
|
||||
+ .endif
|
||||
|
||||
@ -1,41 +1,68 @@
|
||||
--- libjbig/Makefile.orig Fri Apr 10 20:33:27 1998
|
||||
+++ libjbig/Makefile Tue Sep 15 10:03:50 1998
|
||||
@@ -5,9 +5,9 @@
|
||||
CC = gcc
|
||||
|
||||
# Options for the compiler: A high optimization level is suggested
|
||||
-CFLAGS = -O -Wall -ansi -pedantic
|
||||
+CFLAGS += -Wall -ansi -pedantic
|
||||
|
||||
-all: libjbig.a tstcodec
|
||||
+all: libjbig.a libjbig.so.1
|
||||
|
||||
tstcodec: tstcodec.c jbig.c jbig.h jbig_tab.o
|
||||
$(CC) $(CFLAGS) -o tstcodec -DTEST_CODEC tstcodec.c jbig.c \
|
||||
@@ -18,10 +18,25 @@
|
||||
ar rc libjbig.a jbig.o jbig_tab.o
|
||||
ranlib libjbig.a
|
||||
|
||||
+libjbig.so.1: jbig.so jbig_tab.so
|
||||
+ rm -f libjbig.so.1
|
||||
+.if defined(PORTOBJFORMAT) && ${PORTOBJFORMAT} == elf
|
||||
+ $(CC) -o ${.TARGET} -shared -Wl,-soname,${.TARGET} ${.ALLSRC}
|
||||
+.else
|
||||
+ ld -Bshareable -o ${.TARGET} ${.ALLSRC}
|
||||
+.endif
|
||||
+ ln -sf libjbig.so.1 libjbig.so
|
||||
+
|
||||
jbig.o: jbig.c jbig.h
|
||||
|
||||
+.SUFFIXES: .c .so
|
||||
+.c.so:
|
||||
+ ${CC} -c -fpic -DPIC ${CFLAGS} ${.IMPSRC} -o ${.TARGET}
|
||||
+jbig.so: jbig.c jbig.h
|
||||
+jbig_tab.so: jbig_tab.c
|
||||
+
|
||||
test: tstcodec
|
||||
./tstcodec
|
||||
|
||||
clean:
|
||||
- rm -f *.o *~ core gmon.out dbg_d\=??.pbm tstcodec
|
||||
+ rm -f *.o *~ core gmon.out dbg_d\=??.pbm tstcodec *.so libjbig.so.1 libjbig.a
|
||||
*** libjbig/Makefile.orig Fri Apr 10 20:33:27 1998
|
||||
--- libjbig/Makefile Wed Sep 16 09:15:13 1998
|
||||
***************
|
||||
*** 5,13 ****
|
||||
CC = gcc
|
||||
|
||||
# Options for the compiler: A high optimization level is suggested
|
||||
! CFLAGS = -O -Wall -ansi -pedantic
|
||||
|
||||
! all: libjbig.a tstcodec
|
||||
|
||||
tstcodec: tstcodec.c jbig.c jbig.h jbig_tab.o
|
||||
$(CC) $(CFLAGS) -o tstcodec -DTEST_CODEC tstcodec.c jbig.c \
|
||||
--- 5,20 ----
|
||||
CC = gcc
|
||||
|
||||
# Options for the compiler: A high optimization level is suggested
|
||||
! CFLAGS += -Wall -ansi -pedantic
|
||||
|
||||
! JBIGLIB=libjbig.a
|
||||
! .if ${PORTOBJFORMAT} == elf
|
||||
! SOJBIGLIB=libjbig.so.1
|
||||
! .else
|
||||
! SOJBIGLIB=libjbig.so.1.0
|
||||
! .endif
|
||||
!
|
||||
! all: libjbig.a $(SOJBIGLIB)
|
||||
|
||||
tstcodec: tstcodec.c jbig.c jbig.h jbig_tab.o
|
||||
$(CC) $(CFLAGS) -o tstcodec -DTEST_CODEC tstcodec.c jbig.c \
|
||||
***************
|
||||
*** 18,27 ****
|
||||
ar rc libjbig.a jbig.o jbig_tab.o
|
||||
ranlib libjbig.a
|
||||
|
||||
jbig.o: jbig.c jbig.h
|
||||
|
||||
test: tstcodec
|
||||
./tstcodec
|
||||
|
||||
clean:
|
||||
! rm -f *.o *~ core gmon.out dbg_d\=??.pbm tstcodec
|
||||
--- 25,49 ----
|
||||
ar rc libjbig.a jbig.o jbig_tab.o
|
||||
ranlib libjbig.a
|
||||
|
||||
+ $(SOJBIGLIB): jbig.so jbig_tab.so
|
||||
+ rm -f ${.TARGET}
|
||||
+ .if ${PORTOBJFORMAT} == elf
|
||||
+ $(CC) -o ${.TARGET} -shared -Wl,-soname,${.TARGET} ${.ALLSRC}
|
||||
+ ln -sf ${.TARGET} `echo ${.TARGET} | sed 's/\.so.*$$/.so/'`
|
||||
+ .else
|
||||
+ ld -Bshareable -o ${.TARGET} ${.ALLSRC}
|
||||
+ .endif
|
||||
+
|
||||
jbig.o: jbig.c jbig.h
|
||||
|
||||
+ .SUFFIXES: .c .so
|
||||
+ .c.so:
|
||||
+ ${CC} -c -fpic -DPIC ${CFLAGS} ${.IMPSRC} -o ${.TARGET}
|
||||
+ jbig.so: jbig.c jbig.h
|
||||
+ jbig_tab.so: jbig_tab.c
|
||||
+
|
||||
test: tstcodec
|
||||
./tstcodec
|
||||
|
||||
clean:
|
||||
! rm -f *.o *~ core gmon.out dbg_d\=??.pbm tstcodec *.so libjbig.so.1 libjbig.so.1.0 libjbig.a
|
||||
|
||||
Loading…
Reference in New Issue
Block a user