diff options
| author | Sam James <sam@cmpct.info> | 2022-01-18 13:30:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-18 14:30:14 +0100 |
| commit | c2b7d77784beeae5f86f19e33ba3da5ddce55898 (patch) | |
| tree | 3fc4f7fc31219e051afbca994274ee1c6f92112d /tests/unit | |
| parent | e4a7990a4e4842b4e6f5b10fb51ab288fa340240 (diff) | |
build: respect environment options more (#1392)
* build: update m4/ax_pthread.m4 from serial 23 -> serial 31
Update ax_pthread.m4 to the latest version from the autoconf-archive
project.
Signed-off-by: Sam James <sam@gentoo.org>
* build: properly detect AR, CC, RANLIB
It's necessary to be able to override choice of AR/CC/RANLIB and other toolchain
variables/tools for cross-compilation, testing with other toolchains, and
to ensure the compiler chosen by the user is actually used for the build.
Previously, GNU_PREFIX was kind-of used for this but this isn't a standard
variable (at all) and it wasn't applied consistently anyway.
We now use the standard autoconf mechanisms for finding these tools.
(RANLIB is already covered by LT_INIT.)
Signed-off-by: Sam James <sam@gentoo.org>
* build: use $(MAKE)
This ensures that parallel make works correctly, as otherwise, a fresh
make job will be started without the jobserver fd, and hence
not know about its parent, forcing -j1.
* build: respect CPPFLAGS, LDFLAGS
- CPPFLAGS is for the C preprocessor (usually for setting defines)
- LDFLAGS should be placed before objects for certain flags to work
(e.g. -Wl,--as-needed)
Signed-off-by: Sam James <sam@gentoo.org>
Co-authored-by: Luca Deri <lucaderi@users.noreply.github.com>
Diffstat (limited to 'tests/unit')
| -rw-r--r-- | tests/unit/Makefile.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/unit/Makefile.in b/tests/unit/Makefile.in index 98a3d67f4..b2f779fd3 100644 --- a/tests/unit/Makefile.in +++ b/tests/unit/Makefile.in @@ -6,7 +6,8 @@ SRCHOME=../../src CFLAGS=-g -fPIC -DPIC -I$(SRCHOME)/include @JSONC_CFLAGS@ @PCAP_INC@ @CFLAGS@ LIBNDPI=$(SRCHOME)/lib/libndpi.a -LDFLAGS=$(LIBNDPI) @PCAP_LIB@ @LIBS@ @ADDITIONAL_LIBS@ @JSONC_LIBS@ -lpthread @LDFLAGS@ +LIBS=$(LIBNDPI) @PCAP_LIB@ @LIBS@ @ADDITIONAL_LIBS@ @JSONC_LIBS@ -lpthread +LDFLAGS=@LDFLAGS@ HEADERS=$(SRCHOME)/include/ndpi_api.h $(SRCHOME)/include/ndpi_typedefs.h $(SRCHOME)/include/ndpi_protocol_ids.h OBJS=unit PREFIX?=@prefix@ @@ -23,10 +24,10 @@ EXECUTABLE_SOURCES := unit.c COMMON_SOURCES := $(filter-out $(EXECUTABLE_SOURCES),$(wildcard *.c )) unit: $(LIBNDPI) unit.o - $(CC) $(CFLAGS) unit.o -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) unit.o $(LIBS) -o $@ %.o: %.c $(HEADERS) Makefile - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ clean: /bin/rm -f *.o unit |