summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2015-01-11 23:50:37 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2015-01-11 23:50:37 +0000
commit2898d7c9683311d8b9f370d6f82beb160f8a8f1d (patch)
tree4d4fddbd1c6a2a875d3e4a581da381cebd033c7d
parent007a0cdbdd965c78449008cff72f7406acab31f6 (diff)
downloads6-networking-2898d7c9683311d8b9f370d6f82beb160f8a8f1d.tar.xz
Clean up static/shared libs initialization in configure and Makefile
-rw-r--r--Makefile6
-rwxr-xr-xconfigure2
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 4ec01d3..cdd3415 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,9 @@
it: all
CC = $(error Please use ./configure first)
-EXTRA_TARGETS :=
+
+STATIC_LIBS :=
+SHARED_LIBS :=
-include config.mak
include package/targets.mak
@@ -36,7 +38,7 @@ ALL_INCLUDES := $(wildcard src/include/$(package)/*.h)
all: $(ALL_LIBS) $(ALL_BINS) $(ALL_INCLUDES)
clean:
- @exec rm -f $(ALL_LIBS) $(ALL_BINS) $(wildcard src/*/*.o src/*/*.lo) $(EXTRA_TARGETS)
+ @exec rm -f $(ALL_LIBS) $(ALL_BINS) $(wildcard src/*/*.o src/*/*.lo)
distclean: clean
@exec rm -f config.mak src/include/${package}/config.h
diff --git a/configure b/configure
index d2ff997..056061c 100755
--- a/configure
+++ b/configure
@@ -361,8 +361,6 @@ if $allstatic ; then
vpathd=
fi
echo "vpath lib%.so$vpathd"
-echo "STATIC_LIBS :="
-echo "SHARED_LIBS :="
if $static ; then
echo "DO_STATIC := 1"
else