summary refs log tree commit diff
path: root/Makefile
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2017-10-05 20:25:20 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2017-10-05 20:25:20 +0000
commitf6fc552d09c7b2cafeb69023c318b66940548041 (patch)
treebdd216b48cbd25c4ed29a53333515f91e2499293 /Makefile
parent55be2c3525bd14a64664116b809fcb9d69eeb8a9 (diff)
downloads6-f6fc552d09c7b2cafeb69023c318b66940548041.tar.gz
s6-f6fc552d09c7b2cafeb69023c318b66940548041.tar.xz
s6-f6fc552d09c7b2cafeb69023c318b66940548041.zip
Better *FLAGS management; prepare for 2.6.1.1
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index bffc468..259d624 100644
--- a/Makefile
+++ b/Makefile
@@ -40,10 +40,10 @@ include package/deps.mak
 version_m := $(basename $(version))
 version_M := $(basename $(version_m))
 version_l := $(basename $(version_M))
-CPPFLAGS_ALL := -iquote src/include-local -Isrc/include $(CPPFLAGS)
-CFLAGS_ALL := $(CFLAGS) -pipe -Wall
+CPPFLAGS_ALL := $(CPPFLAGS_AUTO) $(CPPFLAGS)
+CFLAGS_ALL := $(CFLAGS_AUTO) $(CFLAGS)
 CFLAGS_SHARED := -fPIC
-LDFLAGS_ALL := $(LDFLAGS)
+LDFLAGS_ALL := $(LDFLAGS_AUTO) $(LDFLAGS)
 REALCC = $(CROSS_COMPILE)$(CC)
 AR := $(CROSS_COMPILE)ar
 RANLIB := $(CROSS_COMPILE)ranlib