diff options
| author | Scott Mace <smace@FreeBSD.org> | 1998-09-16 22:39:20 +0000 |
|---|---|---|
| committer | Scott Mace <smace@FreeBSD.org> | 1998-09-16 22:39:20 +0000 |
| commit | 14067fc5a8fbec8500bececc458c26140308511c (patch) | |
| tree | 72f1524653f6a78b88440d75f018a75a627c2c2b /graphics/jbigkit/files/patch-ab | |
| parent | Upgrade to 0.6. (diff) | |
correct package build for aout system
Diffstat (limited to 'graphics/jbigkit/files/patch-ab')
| -rw-r--r-- | graphics/jbigkit/files/patch-ab | 116 |
1 files changed, 48 insertions, 68 deletions
diff --git a/graphics/jbigkit/files/patch-ab b/graphics/jbigkit/files/patch-ab index 7cc2187470c2..75409fb63ca8 100644 --- a/graphics/jbigkit/files/patch-ab +++ b/graphics/jbigkit/files/patch-ab @@ -1,68 +1,48 @@ -*** 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 +--- libjbig/Makefile.orig Fri Apr 10 20:33:27 1998 ++++ libjbig/Makefile Wed Sep 16 11:57:16 1998 +@@ -5,9 +5,16 @@ + 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 ++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,10 +25,25 @@ + 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 ++ rm -f *.o *~ core gmon.out dbg_d\=??.pbm tstcodec *.so libjbig.so.1 libjbig.so.1.0 libjbig.a |
