diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2022-03-16 11:03:57 +0100 |
|---|---|---|
| committer | lns <matzeton@googlemail.com> | 2022-04-14 19:17:48 +0200 |
| commit | c3df3a12aa88739e303340ccd7436d467b4662d2 (patch) | |
| tree | 13355914f93b668afb47f2b5b643dffc073fb8e7 /tests/dga | |
| parent | 4775be3d85434d4e385f43a47b783844bbfb2571 (diff) | |
Fixed msys2 build warnings and re-activated CI Mingw64 build.fix/windows-msys2
* Removed Visual Studio leftovers. Maintaining an autotools project with VS integration requires some additional overhead.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Signed-off-by: lns <matzeton@googlemail.com>
Diffstat (limited to 'tests/dga')
| -rw-r--r-- | tests/dga/Makefile.in | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/tests/dga/Makefile.in b/tests/dga/Makefile.in index e2846830e..efa8b188b 100644 --- a/tests/dga/Makefile.in +++ b/tests/dga/Makefile.in @@ -1,36 +1,33 @@ CC=@CC@ CXX=@CXX@ -BUILD_MINGW=@BUILD_MINGW@ +EXE_SUFFIX=@EXE_SUFFIX@ SRCHOME=../../src -CFLAGS=-g -fPIC -DPIC -I$(SRCHOME)/include @JSONC_CFLAGS@ @PCAP_INC@ @CFLAGS@ +ifneq ($(OS),Windows_NT) +CFLAGS+=-fPIC -DPIC +endif +CFLAGS+=-g -I$(SRCHOME)/include @CFLAGS@ LIBNDPI=$(SRCHOME)/lib/libndpi.a -LIBS=$(LIBNDPI) @PCAP_LIB@ @LIBS@ @ADDITIONAL_LIBS@ @JSONC_LIBS@ -lpthread +LIBS=$(LIBNDPI) @LIBS@ @ADDITIONAL_LIBS@ -lpthread LDFLAGS=@LDFLAGS@ HEADERS=$(SRCHOME)/include/ndpi_api.h $(SRCHOME)/include/ndpi_typedefs.h $(SRCHOME)/include/ndpi_protocol_ids.h OBJS=dga_evaluate PREFIX?=@prefix@ -ifneq ($(BUILD_MINGW),) -all: - @echo 'DGA test disabled due to mingw build.' - -else - -all: dga_evaluate +all: dga_evaluate$(EXE_SUFFIX) EXECUTABLE_SOURCES := dga_evaluate.c COMMON_SOURCES := $(filter-out $(EXECUTABLE_SOURCES),$(wildcard *.c )) -dga_evaluate: $(LIBNDPI) dga_evaluate.o +dga_evaluate$(EXE_SUFFIX): $(LIBNDPI) dga_evaluate.o $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) dga_evaluate.o $(LIBS) -o $@ %.o: %.c $(HEADERS) Makefile $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ clean: - /bin/rm -f *.o dga_evaluate + /bin/rm -f *.o dga_evaluate$(EXE_SUFFIX) /bin/rm -f .*.o.cmd .*.o.d /bin/rm -rf build @@ -42,5 +39,3 @@ distdir: distclean: clean /bin/rm -f Makefile - -endif |