From c021033bdfbe5d45a0ae69259d0c1b0ea6188563 Mon Sep 17 00:00:00 2001 From: bol-van Date: Fri, 5 Mar 2021 21:23:32 +0300 Subject: [PATCH] makefiles: avoid redefining STRIP --- ip2net/Makefile | 5 ++--- mdig/Makefile | 5 ++--- nfq/Makefile | 5 ++--- tpws/Makefile | 5 ++--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/ip2net/Makefile b/ip2net/Makefile index 069f743..055cf5f 100644 --- a/ip2net/Makefile +++ b/ip2net/Makefile @@ -2,17 +2,16 @@ CC ?= gcc CFLAGS += -std=gnu99 -O3 CFLAGS_BSD = -Wno-address-of-packed-member -Wno-logical-op-parentheses -Wno-switch CFLAGS_MAC = -mmacosx-version-min=10.8 -STRIP = -s LIBS = SRC_FILES = *.c all: ip2net ip2net: $(SRC_FILES) - $(CC) $(STRIP) $(CFLAGS) -o $@ $(SRC_FILES) $(LDFLAGS) $(LIBS) + $(CC) -s $(CFLAGS) -o $@ $(SRC_FILES) $(LDFLAGS) $(LIBS) bsd: $(SRC_FILES) - $(CC) $(STRIP) $(CFLAGS) $(CFLAGS_BSD) -o ip2net $(SRC_FILES) $(LDFLAGS) $(LIBS) + $(CC) -s $(CFLAGS) $(CFLAGS_BSD) -o ip2net $(SRC_FILES) $(LDFLAGS) $(LIBS) mac: $(SRC_FILES) $(CC) $(CFLAGS) $(CFLAGS_BSD) $(CFLAGS_MAC) -o ip2net $(SRC_FILES) $(LDFLAGS) $(LIBS) diff --git a/mdig/Makefile b/mdig/Makefile index 05d193d..a12a51d 100644 --- a/mdig/Makefile +++ b/mdig/Makefile @@ -2,17 +2,16 @@ CC ?= gcc CFLAGS += -std=gnu99 -O3 CFLAGS_BSD = -Wno-address-of-packed-member -Wno-logical-op-parentheses -Wno-switch CFLAGS_MAC = -mmacosx-version-min=10.8 -STRIP = -s LIBS = -lpthread SRC_FILES = *.c all: mdig mdig: $(SRC_FILES) - $(CC) $(STRIP) $(CFLAGS) -o $@ $(SRC_FILES) $(LDFLAGS) $(LIBS) + $(CC) -s $(CFLAGS) -o $@ $(SRC_FILES) $(LDFLAGS) $(LIBS) bsd: $(SRC_FILES) - $(CC) $(STRIP) $(CFLAGS) $(CFLAGS_BSD) -o mdig $(SRC_FILES) $(LDFLAGS) $(LIBS) + $(CC) -s $(CFLAGS) $(CFLAGS_BSD) -o mdig $(SRC_FILES) $(LDFLAGS) $(LIBS) mac: $(SRC_FILES) $(CC) $(CFLAGS) $(CFLAGS_BSD) $(CFLAGS_MAC) -o mdig $(SRC_FILES) $(LDFLAGS) $(LIBS) diff --git a/nfq/Makefile b/nfq/Makefile index 9419e93..13f4745 100644 --- a/nfq/Makefile +++ b/nfq/Makefile @@ -2,7 +2,6 @@ CC ?= gcc CFLAGS += -std=gnu99 -O3 CFLAGS_BSD = -Wno-address-of-packed-member -Wno-logical-op-parentheses -Wno-switch CFLAGS_MAC = -mmacosx-version-min=10.8 -STRIP = -s LIBS = -lnetfilter_queue -lnfnetlink -lz LIBS_BSD = -lz SRC_FILES = *.c @@ -10,10 +9,10 @@ SRC_FILES = *.c all: nfqws nfqws: $(SRC_FILES) - $(CC) $(STRIP) $(CFLAGS) -o $@ $(SRC_FILES) $(LDFLAGS) $(LIBS) + $(CC) -s $(CFLAGS) -o $@ $(SRC_FILES) $(LDFLAGS) $(LIBS) bsd: $(SRC_FILES) - $(CC) $(STRIP) $(CFLAGS) $(CFLAGS_BSD) -o dvtws $(SRC_FILES) $(LDFLAGS) $(LIBS_BSD) + $(CC) -s $(CFLAGS) $(CFLAGS_BSD) -o dvtws $(SRC_FILES) $(LDFLAGS) $(LIBS_BSD) mac: $(SRC_FILES) $(CC) $(CFLAGS) $(CFLAGS_BSD) $(CFLAGS_MAC) -o dvtws $(SRC_FILES) $(LDFLAGS) $(LIBS_BSD) diff --git a/tpws/Makefile b/tpws/Makefile index 8d70603..31086dc 100644 --- a/tpws/Makefile +++ b/tpws/Makefile @@ -2,17 +2,16 @@ CC ?= gcc CFLAGS += -std=gnu99 -O3 CFLAGS_BSD = -Wno-address-of-packed-member -Wno-logical-op-parentheses -Wno-switch CFLAGS_MAC = -mmacosx-version-min=10.8 -STRIP = -s LIBS = -lz SRC_FILES = *.c all: tpws tpws: $(SRC_FILES) - $(CC) $(STRIP) $(CFLAGS) -o $@ $(SRC_FILES) $(LDFLAGS) $(LIBS) + $(CC) -s $(CFLAGS) -o $@ $(SRC_FILES) $(LDFLAGS) $(LIBS) bsd: $(SRC_FILES) - $(CC) $(STRIP) $(CFLAGS) $(CFLAGS_BSD) -Iepoll-shim/include -o tpws $(SRC_FILES) epoll-shim/src/*.c $(LDFLAGS) $(LIBS) + $(CC) -s $(CFLAGS) $(CFLAGS_BSD) -Iepoll-shim/include -o tpws $(SRC_FILES) epoll-shim/src/*.c $(LDFLAGS) $(LIBS) mac: $(SRC_FILES) $(CC) $(CFLAGS) $(CFLAGS_BSD) $(CFLAGS_MAC) -Iepoll-shim/include -Imacos -o tpws $(SRC_FILES) epoll-shim/src/*.c $(LDFLAGS) $(LIBS)