handle build flags and build a shared library.

These are two distinct problems, but a single patch avoid
merging changes.

The part handling CFLAGS should be forwarded.

Gbp-Pq: Name makefile.diff
This commit is contained in:
Anibal Monsalve Salazar 2022-08-14 13:55:59 +08:00 committed by luoyaoming
parent dff73a3eec
commit 8ff2053a08
1 changed files with 33 additions and 30 deletions

View File

@ -12,6 +12,8 @@
# in the file LICENSE. # in the file LICENSE.
# ------------------------------------------------------------------ # ------------------------------------------------------------------
somajor=1.0
sominor=$(somajor).4
SHELL=/bin/sh SHELL=/bin/sh
# To assist in cross-compiling # To assist in cross-compiling
@ -37,29 +39,50 @@ OBJS= blocksort.o \
all: libbz2.a bzip2 bzip2recover test all: libbz2.a bzip2 bzip2recover test
bzip2: libbz2.a bzip2.o bzip2: libbz2.so bzip2.o
$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2 $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
bzip2recover: bzip2recover.o bzip2recover: bzip2recover.o
$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o
libbz2.a: $(OBJS) libbz2.a: $(OBJS)
rm -f libbz2.a rm -f libbz2.a
$(AR) cq libbz2.a $(OBJS) $(AR) cq libbz2.a $(OBJS)
@if ( test -f $(RANLIB) -o -f /usr/bin/ranlib -o \ @if ( test -f $(RANLIB) || test -f /usr/bin/ranlib || \
-f /bin/ranlib -o -f /usr/ccs/bin/ranlib ) ; then \ test -f /bin/ranlib || test -f /usr/ccs/bin/ranlib ) ; then \
echo $(RANLIB) libbz2.a ; \ echo $(RANLIB) libbz2.a ; \
$(RANLIB) libbz2.a ; \ $(RANLIB) libbz2.a ; \
fi fi
libbz2.so: libbz2.so.$(somajor)
ln -sf $^ $@
libbz2.so.$(somajor): libbz2.so.$(sominor)
ln -sf $^ $@
libbz2.so.$(sominor): $(OBJS:%.o=%.sho)
$(CC) -o libbz2.so.$(sominor) -shared $(LDFLAGS) \
-Wl,-soname,libbz2.so.$(somajor) $^ -lc
$(OBJS:%.o=%.sho) bzip2.sho bzip2recover.sho: %.sho: %.c
$(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -o $@ -c $<
$(OBJS) bzip2.o bzip2recover.o: %.o: %.c
$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
check: test check: test
test: bzip2 test: bzip2
@cat words1 @cat words1
LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
./bzip2 -1 < sample1.ref > sample1.rb2 ./bzip2 -1 < sample1.ref > sample1.rb2
LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
./bzip2 -2 < sample2.ref > sample2.rb2 ./bzip2 -2 < sample2.ref > sample2.rb2
LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
./bzip2 -3 < sample3.ref > sample3.rb2 ./bzip2 -3 < sample3.ref > sample3.rb2
LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
./bzip2 -d < sample1.bz2 > sample1.tst ./bzip2 -d < sample1.bz2 > sample1.tst
LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
./bzip2 -d < sample2.bz2 > sample2.tst ./bzip2 -d < sample2.bz2 > sample2.tst
LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
./bzip2 -ds < sample3.bz2 > sample3.tst ./bzip2 -ds < sample3.bz2 > sample3.tst
cmp sample1.bz2 sample1.rb2 cmp sample1.bz2 sample1.rb2
cmp sample2.bz2 sample2.rb2 cmp sample2.bz2 sample2.rb2
@ -69,15 +92,15 @@ test: bzip2
cmp sample3.tst sample3.ref cmp sample3.tst sample3.ref
@cat words3 @cat words3
install: bzip2 bzip2recover install: bzip2 bzip2recover libbz2.a
if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
cp -f bzip2 $(PREFIX)/bin/bzip2 cp -f bzip2 $(PREFIX)/bin/bzip2
cp -f bzip2 $(PREFIX)/bin/bunzip2 ln $(PREFIX)/bin/bzip2 $(PREFIX)/bin/bunzip2
cp -f bzip2 $(PREFIX)/bin/bzcat ln $(PREFIX)/bin/bzip2 $(PREFIX)/bin/bzcat
cp -f bzip2recover $(PREFIX)/bin/bzip2recover cp -f bzip2recover $(PREFIX)/bin/bzip2recover
chmod a+x $(PREFIX)/bin/bzip2 chmod a+x $(PREFIX)/bin/bzip2
chmod a+x $(PREFIX)/bin/bunzip2 chmod a+x $(PREFIX)/bin/bunzip2
@ -87,7 +110,7 @@ install: bzip2 bzip2recover
chmod a+r $(PREFIX)/man/man1/bzip2.1 chmod a+r $(PREFIX)/man/man1/bzip2.1
cp -f bzlib.h $(PREFIX)/include cp -f bzlib.h $(PREFIX)/include
chmod a+r $(PREFIX)/include/bzlib.h chmod a+r $(PREFIX)/include/bzlib.h
cp -f libbz2.a $(PREFIX)/lib cp -fa libbz2.a libbz2.so* $(PREFIX)/lib
chmod a+r $(PREFIX)/lib/libbz2.a chmod a+r $(PREFIX)/lib/libbz2.a
cp -f bzgrep $(PREFIX)/bin/bzgrep cp -f bzgrep $(PREFIX)/bin/bzgrep
ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
@ -109,30 +132,10 @@ install: bzip2 bzip2recover
echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1 echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
clean: clean:
rm -f *.o libbz2.a bzip2 bzip2recover \ rm -f *.o *.sho libbz2.a libbz2.so* bzip2 bzip2recover \
sample1.rb2 sample2.rb2 sample3.rb2 \ sample1.rb2 sample2.rb2 sample3.rb2 \
sample1.tst sample2.tst sample3.tst sample1.tst sample2.tst sample3.tst
blocksort.o: blocksort.c
@cat words0
$(CC) $(CFLAGS) -c blocksort.c
huffman.o: huffman.c
$(CC) $(CFLAGS) -c huffman.c
crctable.o: crctable.c
$(CC) $(CFLAGS) -c crctable.c
randtable.o: randtable.c
$(CC) $(CFLAGS) -c randtable.c
compress.o: compress.c
$(CC) $(CFLAGS) -c compress.c
decompress.o: decompress.c
$(CC) $(CFLAGS) -c decompress.c
bzlib.o: bzlib.c
$(CC) $(CFLAGS) -c bzlib.c
bzip2.o: bzip2.c
$(CC) $(CFLAGS) -c bzip2.c
bzip2recover.o: bzip2recover.c
$(CC) $(CFLAGS) -c bzip2recover.c
distclean: clean distclean: clean
rm -f manual.ps manual.html manual.pdf rm -f manual.ps manual.html manual.pdf