From 7bd78a7e85f16e0090a0e191ca53ab1db66f747b Mon Sep 17 00:00:00 2001 From: Marcel Poul Date: Sun, 14 Oct 2012 12:51:57 +0000 Subject: [PATCH] Build with caNl by default, enable Warnings with "make WALL=yes" --- org.gridsite.core/src/Makefile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile index dbfc8c0..72d560a 100644 --- a/org.gridsite.core/src/Makefile +++ b/org.gridsite.core/src/Makefile @@ -81,17 +81,20 @@ endif # caNl adoption part # caNl library and headers have to be in standard system places. # Print all warnings -ifeq ($(GRIDSITE_WITH_CANL),yes) +ifeq ($(GRIDSITE_WITH_CANL),no) +MOD_GRIDSITE_FILE=mod_gridsite.c +GRST_X509_FILE=grst_x509.c +MOD_SSLPRIVATE_HEADER=mod_ssl-private.h +MYCANLLDFLAGS= +else GRST_X509_FILE=grst_canl_x509.c MOD_GRIDSITE_FILE=canl_mod_gridsite.c MOD_SSLPRIVATE_HEADER=canl_mod_ssl-private.h MYCANLLDFLAGS=-lcanl_c +endif + +ifeq ($(WALL),yes) MYCFLAGS += -Wall -else -MOD_GRIDSITE_FILE=mod_gridsite.c -GRST_X509_FILE=grst_x509.c -MOD_SSLPRIVATE_HEADER=mod_ssl-private.h -MYCANLLDFLAGS= endif # -- 1.8.2.3