diff options
| author | Luca Deri <deri@ntop.org> | 2020-08-22 16:41:51 +0200 |
|---|---|---|
| committer | Luca Deri <deri@ntop.org> | 2020-08-22 16:41:51 +0200 |
| commit | af3ce74e0245e0e407d4757e95d4d73563188521 (patch) | |
| tree | 5c756dc702f9e95b05f6bf47aab9f113efe40031 | |
| parent | 93003d052311023836da6a39eb5f6fbe8b89745e (diff) | |
Fixes compilation issues introduced by https://github.com/ntop/nDPI/pull/989
| -rw-r--r-- | configure.seed | 2 | ||||
| -rw-r--r-- | src/lib/Makefile.in | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/configure.seed b/configure.seed index aed5c3529..763e868e1 100644 --- a/configure.seed +++ b/configure.seed @@ -10,8 +10,6 @@ AS_IF([test "${with_only_libndpi+set}" = set],[ EXTRA_TARGETS="" ]) - - AC_ARG_WITH(sanitizer, AS_HELP_STRING([--with-sanitizer], [Build with support for address, undefined and leak sanitizer])) AC_ARG_ENABLE(fuzztargets, AS_HELP_STRING([--enable-fuzztargets], [Enable fuzz targets]),[enable_fuzztargets=$enableval],[enable_fuzztargets=no]) AM_CONDITIONAL([BUILD_FUZZTARGETS], [test "x$enable_fuzztargets" = "xyes"]) diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 874cee20c..09e1a7d09 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -15,7 +15,7 @@ libdir = ${prefix}/lib includedir = ${prefix}/include/ndpi CC = @CC@ CFLAGS += -fPIC -DPIC -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION -Wall @CFLAGS@ @CUSTOM_NDPI@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ @ADDITIONAL_LIBS@ @LIBS@ RANLIB = ranlib OBJECTS = $(patsubst protocols/%.c, protocols/%.o, $(wildcard protocols/*.c)) $(patsubst third_party/src/%.c, third_party/src/%.o, $(wildcard third_party/src/*.c)) $(patsubst ./%.c, ./%.o, $(wildcard ./*.c)) @@ -46,12 +46,12 @@ $(NDPI_LIB_STATIC): $(OBJECTS) $(RANLIB) $@ $(NDPI_LIB_SHARED): $(OBJECTS) - $(CC) -shared -fPIC $(SONAME_FLAG) -o $@ $(OBJECTS) $(LDFLAGS) @ADDITIONAL_LIBS@ + $(CC) -shared -fPIC $(SONAME_FLAG) -o $@ $(OBJECTS) $(LDFLAGS) ln -fs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE) ln -fs $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR) %.o: %.c $(HEADERS) Makefile - $(CC) $(CFLAGS) -c $< -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) -c $< -o $@ clean: /bin/rm -f $(NDPI_LIB_STATIC) $(OBJECTS) *.o *.so *.lo libndpi.so* |