Revert "multipath-tools: merge OPTFLAGS into CFLAGS"
authorChristophe Varoqui <christophe.varoqui@opensvc.com>
Fri, 22 Jul 2016 08:53:14 +0000 (10:53 +0200)
committerChristophe Varoqui <christophe.varoqui@opensvc.com>
Fri, 22 Jul 2016 08:53:35 +0000 (10:53 +0200)
This reverts commit 97ab8ba5e22fa4e84ae6749e5ff5d948332377f1.

Hannes reports Suse buildsystem is using a distinct set of flags,
required by its build process. This patch broke their build.

Makefile.inc

index b7077fc..01d743c 100644 (file)
@@ -60,9 +60,10 @@ RM          = rm -f
 LN          = ln -sf
 INSTALL_PROGRAM = install
 
-CFLAGS      = -Wunused -Wstrict-prototypes -O2 -g -pipe -Wformat-security -Wall \
-               -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 \
-               -fPIC -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\"
+OPTFLAGS     = -Wunused -Wstrict-prototypes -O2 -g -pipe -Wformat-security -Wall \
+               -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4
+
+CFLAGS      = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\"
 SHARED_FLAGS = -shared
 
 %.o:   %.c