diff options
| author | Paul Mackerras <paulus@ozlabs.org> | 2020-12-31 16:00:37 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@ozlabs.org> | 2020-12-31 16:00:37 +1100 |
| commit | efc6162c8d633dc715f2b42b76513b1d2152d484 (patch) | |
| tree | 2273d30a6b3113e6113b1d6e4aa803d9f3e2f5d9 /pppdump | |
| parent | 861202529f60b020c5a6d0c0176c4291856114cc (diff) | |
| download | ppp-efc6162c8d633dc715f2b42b76513b1d2152d484.tar.gz | |
Revert "pppdump: support building with the system zlib (#189)"
This reverts commit c98cc28f128dffc456488c74b600640057da6994
because of compile errors in pppdump:
cc -o pppdump pppdump.o deflate.o bsd-comp.o -lz
/usr/bin/ld: deflate.o: in function `z_incomp':
deflate.c:(.text+0x99): undefined reference to `inflateIncomp'
/usr/bin/ld: deflate.o: in function `z_decomp_alloc':
deflate.c:(.text+0x355): undefined reference to `inflateInit2'
collect2: error: ld returned 1 exit status
make[1]: *** [Makefile:38: pppdump] Error 1
The copy of zlib here is not the same as the standard upstream zlib;
this version has some extra functions added.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Diffstat (limited to 'pppdump')
| -rw-r--r-- | pppdump/Makefile.linux | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/pppdump/Makefile.linux b/pppdump/Makefile.linux index b61bc9d..0457561 100644 --- a/pppdump/Makefile.linux +++ b/pppdump/Makefile.linux @@ -2,39 +2,15 @@ DESTDIR = $(INSTROOT)@DESTDIR@ BINDIR = $(DESTDIR)/sbin MANDIR = $(DESTDIR)/share/man/man8 -DO_DEFLATE=y -DO_BSD_COMPRESS=y -HAVE_ZLIB=n - CFLAGS= -O -I../include/net -OBJS = pppdump.o -LIBS = - -ifdef DO_DEFLATE -CFLAGS += -DDO_DEFLATE=1 -OBJS += deflate.o -ifdef HAVE_ZLIB -LIBS += -lz -else -OBJS += zlib.o -endif -else -CFLAGS += -DDO_DEFLATE=0 -endif - -ifdef DO_BSD_COMPRESS -CFLAGS += -DDO_BSD_COMPRESS=1 -OBJS += bsd-comp.o -else -CFLAGS += -DDO_BSD_COMPRESS=0 -endif +OBJS = pppdump.o bsd-comp.o deflate.o zlib.o INSTALL= install all: pppdump pppdump: $(OBJS) - $(CC) $(LDFLAGS) -o pppdump $(OBJS) $(LIBS) + $(CC) $(LDFLAGS) -o pppdump $(OBJS) clean: rm -f pppdump $(OBJS) *~ |