diff -Naur jbigkit/libjbig/Makefile jbigkit.oden/libjbig/Makefile --- jbigkit/libjbig/Makefile 2004-06-08 16:40:06.000000000 +0200 +++ jbigkit.oden/libjbig/Makefile 2007-08-12 12:55:54.000000000 +0200 @@ -7,16 +7,29 @@ # Options for the compiler: A high optimization level is suggested CFLAGS = -O -Wall -ansi -pedantic -all: libjbig.a tstcodec +AR = ar +RANLIB = ranlib + +all: shared static tstcodec tstcodec: tstcodec.c jbig.c jbig.h jbig_tab.o $(CC) $(CFLAGS) -o tstcodec -DTEST_CODEC tstcodec.c jbig.c \ jbig_tab.o -libjbig.a: jbig.o jbig_tab.o +static: jbig.o jbig_tab.o rm -f libjbig.a - ar rc libjbig.a jbig.o jbig_tab.o - -ranlib libjbig.a + $(AR) rc libjbig.a jbig.o jbig_tab.o + $(RANLIB) libjbig.a + +SOBJS = jbig.lo jbig_tab.lo + +shared: $(SOBJS) + $(CC) -shared $(LDFLAGS) -Wl,-soname=libjbig.so.0 -o libjbig.so.0.0 $(SOBJS) + ln -snf libjbig.so.0.0 libjbig.so.0 + ln -snf libjbig.so.0.0 libjbig.so + +%.lo: %.c jbig.h + $(CC) $(CFLAGS) -fPIC -c $< -o $@ jbig.o: jbig.c jbig.h @@ -28,3 +41,4 @@ clean: rm -f *.o *~ core gmon.out dbg_d\=??.pbm tstcodec t82test.pbm + rm -f libjbig.a libjbig.so* *.lo diff -Naur jbigkit/pbmtools/Makefile jbigkit.oden/pbmtools/Makefile --- jbigkit/pbmtools/Makefile 2007-08-12 13:04:32.000000000 +0200 +++ jbigkit.oden/pbmtools/Makefile 2007-08-12 13:03:23.000000000 +0200 @@ -24,35 +24,35 @@ cd ../libjbig ; $(MAKE) libjbig.a test: pbmtojbg jbgtopbm - $(MAKE) IMG=ccitt1 OPTIONSJ= OPTIONSP= dotest1 - $(MAKE) IMG=ccitt2 OPTIONSJ= OPTIONSP= dotest1 - $(MAKE) IMG=ccitt3 OPTIONSJ= OPTIONSP= dotest1 - $(MAKE) IMG=xvlogo OPTIONSJ= "OPTIONSP=-d 3" dotest1 - $(MAKE) IMG=sandra OPTIONSP= OPTIONSJ= dotest2g - $(MAKE) IMG=sandra OPTIONSP=-b OPTIONSJ=-b dotest2g - $(MAKE) IMG=sandra OPTIONSP=-q OPTIONSJ= dotest2g - $(MAKE) IMG=sandra "OPTIONSP=-o 0" OPTIONSJ= dotest2g - $(MAKE) IMG=sandra "OPTIONSP=-o 2" OPTIONSJ= dotest2g - $(MAKE) IMG=multi OPTIONSP= OPTIONSJ= dotest2g - $(MAKE) IMG=multi OPTIONSP=-b OPTIONSJ=-b dotest2g - $(MAKE) IMG=mx "OPTIONSP=-q -s 3 -m 128" dotest1 - $(MAKE) IMG=mx "OPTIONSP=-q -s 3 -m 128" dotest2b - $(MAKE) IMG=mx "OPTIONSP=-q -s 3 -m 128 -p 92" dotest2b - $(MAKE) IMG=mx "OPTIONSP=-q -Y -1" dotest2b - $(MAKE) IMG=mx "OPTIONSP=-Y -1" dotest2b + LD_PRELOAD="../libjbig/libjbig.so.0.0" $(MAKE) IMG=ccitt1 OPTIONSJ= OPTIONSP= dotest1 + LD_PRELOAD="../libjbig/libjbig.so.0.0" $(MAKE) IMG=ccitt2 OPTIONSJ= OPTIONSP= dotest1 + LD_PRELOAD="../libjbig/libjbig.so.0.0" $(MAKE) IMG=ccitt3 OPTIONSJ= OPTIONSP= dotest1 + LD_PRELOAD="../libjbig/libjbig.so.0.0" $(MAKE) IMG=xvlogo OPTIONSJ= "OPTIONSP=-d 3" dotest1 + LD_PRELOAD="../libjbig/libjbig.so.0.0" $(MAKE) IMG=sandra OPTIONSP= OPTIONSJ= dotest2g + LD_PRELOAD="../libjbig/libjbig.so.0.0" $(MAKE) IMG=sandra OPTIONSP=-b OPTIONSJ=-b dotest2g + LD_PRELOAD="../libjbig/libjbig.so.0.0" $(MAKE) IMG=sandra OPTIONSP=-q OPTIONSJ= dotest2g + LD_PRELOAD="../libjbig/libjbig.so.0.0" $(MAKE) IMG=sandra "OPTIONSP=-o 0" OPTIONSJ= dotest2g + LD_PRELOAD="../libjbig/libjbig.so.0.0" $(MAKE) IMG=sandra "OPTIONSP=-o 2" OPTIONSJ= dotest2g + LD_PRELOAD="../libjbig/libjbig.so.0.0" $(MAKE) IMG=multi OPTIONSP= OPTIONSJ= dotest2g + LD_PRELOAD="../libjbig/libjbig.so.0.0" $(MAKE) IMG=multi OPTIONSP=-b OPTIONSJ=-b dotest2g + LD_PRELOAD="../libjbig/libjbig.so.0.0" $(MAKE) IMG=mx "OPTIONSP=-q -s 3 -m 128" dotest1 + LD_PRELOAD="../libjbig/libjbig.so.0.0" $(MAKE) IMG=mx "OPTIONSP=-q -s 3 -m 128" dotest2b + LD_PRELOAD="../libjbig/libjbig.so.0.0" $(MAKE) IMG=mx "OPTIONSP=-q -s 3 -m 128 -p 92" dotest2b + LD_PRELOAD="../libjbig/libjbig.so.0.0" $(MAKE) IMG=mx "OPTIONSP=-q -Y -1" dotest2b + LD_PRELOAD="../libjbig/libjbig.so.0.0" $(MAKE) IMG=mx "OPTIONSP=-Y -1" dotest2b rm -f test-*.jbg test-*.pbm test-*.pgm - ./jbgtopbm ../examples/ccitt1.jbg | ./pbmtojbg > test-ccitt1.jbg + LD_PRELOAD="../libjbig/libjbig.so.0.0" ./jbgtopbm ../examples/ccitt1.jbg | LD_PRELOAD="../libjbig/libjbig.so.0.0" ./pbmtojbg > test-ccitt1.jbg cmp ../examples/ccitt1.jbg test-ccitt1.jbg rm -f test-*.jbg test-*.pbm test-*.pgm - ./jbgtopbm < ../examples/ccitt1.jbg | ./pbmtojbg - test-ccitt1.jbg + LD_PRELOAD="../libjbig/libjbig.so.0.0" ./jbgtopbm < ../examples/ccitt1.jbg | LD_PRELOAD="../libjbig/libjbig.so.0.0" ./pbmtojbg - test-ccitt1.jbg cmp ../examples/ccitt1.jbg test-ccitt1.jbg rm -f test-*.jbg test-*.pbm test-*.pgm - ./jbgtopbm < ../examples/ccitt1.jbg - test-ccitt1.pbm ; \ - ./pbmtojbg test-ccitt1.pbm test-ccitt1.jbg + LD_PRELOAD="../libjbig/libjbig.so.0.0" ./jbgtopbm < ../examples/ccitt1.jbg - test-ccitt1.pbm ; \ + LD_PRELOAD="../libjbig/libjbig.so.0.0" ./pbmtojbg test-ccitt1.pbm test-ccitt1.jbg cmp ../examples/ccitt1.jbg test-ccitt1.jbg rm -f test-*.jbg test-*.pbm test-*.pgm - ./jbgtopbm ../examples/ccitt1.jbg test-ccitt1.pbm ; \ - ./pbmtojbg test-ccitt1.pbm >test-ccitt1.jbg + LD_PRELOAD="../libjbig/libjbig.so.0.0" ./jbgtopbm ../examples/ccitt1.jbg test-ccitt1.pbm ; \ + LD_PRELOAD="../libjbig/libjbig.so.0.0" ./pbmtojbg test-ccitt1.pbm >test-ccitt1.jbg cmp ../examples/ccitt1.jbg test-ccitt1.jbg rm -f test-*.jbg test-*.pbm test-*.pgm @echo @@ -60,18 +60,18 @@ @echo dotest1: - ./jbgtopbm $(OPTIONSJ) ../examples/$(IMG).jbg test-$(IMG).pbm - ./pbmtojbg $(OPTIONSP) test-$(IMG).pbm test-$(IMG).jbg + LD_PRELOAD="../libjbig/libjbig.so.0.0" ./jbgtopbm $(OPTIONSJ) ../examples/$(IMG).jbg test-$(IMG).pbm + LD_PRELOAD="../libjbig/libjbig.so.0.0" ./pbmtojbg $(OPTIONSP) test-$(IMG).pbm test-$(IMG).jbg cmp test-$(IMG).jbg ../examples/$(IMG).jbg dotest2b: - ./pbmtojbg $(OPTIONSP) test-$(IMG).pbm test-$(IMG).jbg - ./jbgtopbm $(OPTIONSJ) test-$(IMG).jbg test-$(IMG)-2.pbm + LD_PRELOAD="../libjbig/libjbig.so.0.0" ./pbmtojbg $(OPTIONSP) test-$(IMG).pbm test-$(IMG).jbg + LD_PRELOAD="../libjbig/libjbig.so.0.0" ./jbgtopbm $(OPTIONSJ) test-$(IMG).jbg test-$(IMG)-2.pbm cmp test-$(IMG).pbm test-$(IMG)-2.pbm dotest2g: - ./pbmtojbg $(OPTIONSP) ../examples/$(IMG).pgm test-$(IMG).jbg - ./jbgtopbm $(OPTIONSJ) test-$(IMG).jbg test-$(IMG).pgm + LD_PRELOAD="../libjbig/libjbig.so.0.0" ./pbmtojbg $(OPTIONSP) ../examples/$(IMG).pgm test-$(IMG).jbg + LD_PRELOAD="../libjbig/libjbig.so.0.0" ./jbgtopbm $(OPTIONSJ) test-$(IMG).jbg test-$(IMG).pgm cmp test-$(IMG).pgm ../examples/$(IMG).pgm .1.txt:
