build: plugins: properly use CC, CFLAGS and LDFLAGS

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Acked-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>

diff --git a/plugins/auth-pam/Makefile b/plugins/auth-pam/Makefile
index e69fe3ffcb3ebe669e887eb9fc65fe461e138ae5..d45a203c797de8b2bb0b7605cdced5505c3c21c4 100755 (executable)
--- a/plugins/auth-pam/Makefile
+++ b/plugins/auth-pam/Makefile
@@ -13,18 +13,20 @@ else
 endif
 
 # This directory is where we will look for openvpn-plugin.h
-INCLUDE=-I../..
+CPPFLAGS=-I../..
 
-CC_FLAGS=-O2 -Wall -DDLOPEN_PAM=$(DLOPEN_PAM)
+CC=gcc
+CFLAGS=-O2 -Wall
+DEFS = -DDLOPEN_PAM=$(DLOPEN_PAM)
 
 openvpn-auth-pam.so : auth-pam.o pamdl.o
-       gcc ${CC_FLAGS} -fPIC -shared -Wl,-soname,openvpn-auth-pam.so -o openvpn-auth-pam.so auth-pam.o pamdl.o -lc $(LIBPAM)
+       $(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) -Wl,-soname,openvpn-auth-pam.so -o openvpn-auth-pam.so auth-pam.o pamdl.o -lc $(LIBPAM)
 
 auth-pam.o : auth-pam.c pamdl.h
-       gcc ${CC_FLAGS} -fPIC -c ${INCLUDE} auth-pam.c
+       $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) -fPIC -c auth-pam.c
 
 pamdl.o : pamdl.c pamdl.h
-       gcc ${CC_FLAGS} -fPIC -c ${INCLUDE} pamdl.c
+       $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) -fPIC -c pamdl.c
 
 clean :
-       rm -f *.o *.so
+       -rm -f *.o *.so

diff --git a/plugins/defer/build b/plugins/defer/build
index 5907afa79ed56a6ed09ec75d5bddf7d06cfe5693..9629c11f15b3b5b7091fc453e957522435c263d1 100755 (executable)
--- a/plugins/defer/build
+++ b/plugins/defer/build
@@ -6,9 +6,10 @@
 #
 
 # This directory is where we will look for openvpn-plugin.h
-INCLUDE="-I../.."
+CPPFLAGS="${CPPFLAGS:--I../..}"
 
-CC_FLAGS="-O2 -Wall -g"
+CC="${CC:-gcc}"
+CFLAGS="${CFLAGS:--O2 -Wall -g}"
 
-gcc $CC_FLAGS -fPIC -c $INCLUDE $1.c && \
-gcc $CC_FLAGS -fPIC -shared -Wl,-soname,$1.so -o $1.so $1.o -lc
+$CC $CPPFLAGS $CFLAGS -fPIC -c $1.c && \
+$CC $CFLAGS -fPIC -shared $LDFLAGS -Wl,-soname,$1.so -o $1.so $1.o -lc

diff --git a/plugins/down-root/Makefile b/plugins/down-root/Makefile
index 5ce4ffb745f6e25c9cb595c13bb7613b3c657f40..9659b7fddd8d12049a16178ee0c30abbbcfa964e 100755 (executable)
--- a/plugins/down-root/Makefile
+++ b/plugins/down-root/Makefile
@@ -3,15 +3,16 @@
 #
 
 # This directory is where we will look for openvpn-plugin.h
-INCLUDE=-I../..
+CPPFLAGS=-I../..
 
-CC_FLAGS=-O2 -Wall
+CC=gcc
+CFLAGS=-O2 -Wall
 
 down-root.so : down-root.o
-       gcc ${CC_FLAGS} -fPIC -shared -Wl,-soname,openvpn-down-root.so -o openvpn-down-root.so down-root.o -lc
+       $(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) -Wl,-soname,openvpn-down-root.so -o openvpn-down-root.so down-root.o -lc
 
 down-root.o : down-root.c
-       gcc ${CC_FLAGS} -fPIC -c ${INCLUDE} down-root.c
+       $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -c down-root.c
 
 clean :
-       rm -f *.o *.so
+       -rm -f *.o *.so

diff --git a/plugins/examples/build b/plugins/examples/build
index 5907afa79ed56a6ed09ec75d5bddf7d06cfe5693..7605595b36a4e19bd6c02c987169e9f9e5e68721 100755 (executable)
--- a/plugins/examples/build
+++ b/plugins/examples/build
@@ -6,9 +6,10 @@
 #
 
 # This directory is where we will look for openvpn-plugin.h
-INCLUDE="-I../.."
+CPPFLAGS="${CPPFLAGS:--I../..}"
 
-CC_FLAGS="-O2 -Wall -g"
+CC="${CC:-gcc}"
+CFLAGS="${CFLAGS:--O2 -Wall -g}"
 
-gcc $CC_FLAGS -fPIC -c $INCLUDE $1.c && \
-gcc $CC_FLAGS -fPIC -shared -Wl,-soname,$1.so -o $1.so $1.o -lc
+$CC $CPPFLAGS $CFLAGS -fPIC -c $1.c && \
+$CC $CFLAGS -fPIC -shared ${LDFLAS} -Wl,-soname,$1.so -o $1.so $1.o -lc