From 4a3d765cf7402534450fb2ebc045bd5337443194 Mon Sep 17 00:00:00 2001
From: David Troy <dave@popvox.com>
Date: Fri, 14 Apr 2006 17:04:46 +0000
Subject: git-svn-id:
 http://svncommunity.digium.com/svn/astmanproxy/branches/1.21pre@117
 f02b47b9-160a-0410-81a6-dc3441afb0ec

---
 Makefile | 42 +++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 71d2224..9960a86 100644
--- a/Makefile
+++ b/Makefile
@@ -14,12 +14,8 @@ LIBDIR := $(DESTDIR)/usr/lib/astmanproxy
 CONFFILE := astmanproxy.conf
 PERMFILE := astmanproxy.users
 DISTDIR := /var/www/html/astmanproxy
-CERTDIR := /var/lib/asterisk/certs
-PROXYCERT := $(CERTDIR)/proxy-server.pem
-PROXYSSLCONF := $(CONFDIR)/proxy-ssl.conf
 
 CC := gcc
-#LIBS := -lpthread
 INCLUDES :=
 PREFIX:= /usr/local
 BINDIR := $(DESTDIR)$(PREFIX)/sbin
@@ -29,10 +25,14 @@ MODS := astmanproxy config config_perms common proxyfunc log ssl md5
 HANDLERS := xml standard csv http
 SOBJS := $(HANDLERS:%=%.so)
 LIBS := -lssl
+MODDIR := $(LIBDIR)/modules
+
+# Add -g below for debug/GDB symbols
+CFLAGS:=-Wall -O2 -D_REENTRANT -fPIC -Isrc/include -I/usr/include/openssl
 
 ifeq (${OSARCH},Darwin)  
   LIBS+=-lresolv
-  CFLAGS+=-D__Darwin_
+  CFLAGS+=-D__Darwin_ -Iquotesrc/include
   BINDIR=/opt/sbin
   LIBDIR=/opt/lib/astmanproxy
   CONFDIR=/opt/etc/asterisk
@@ -40,27 +40,35 @@ ifeq (${OSARCH},Darwin)
   PERMDIR=/opt/etc/asterisk
   PERMDIR_REAL=/opt/etc/asterisk
   LOGDIR=/opt/log/asterisk
-  OBJS+=dlfcn.o poll.o
+  CERTDIR := /opt/lib/asterisk/certs
+  OBJS+=poll.o
   ASTLINK=-Wl,-force_flat_namespace,-dynamic
   SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
+  MKTEMP=/usr/bin/mktemp
 else
   #These are used for all but Darwin
+  CFLAGS+=-I-
   LIBS+=-ldl -pthread
   ASTLINK=-Wl,-E
   SOLINK=-shared -Xlinker -x
   LOGDIR=/var/log/asterisk   
+  CERTDIR := /var/lib/asterisk/certs
+  MKTEMP=/bin/mktemp
 endif
 
+DEFINES:='-DPROXY_VERSION="$(VERSION)"' '-DCDIR="$(CONFDIR)"' '-DCFILE="$(CONFFILE)"'
+DEFINES+='-DMDIR="$(MODDIR)"' '-DPDIR="$(PERMDIR)"' '-DPFILE="$(PERMFILE)"'
+
+PROXYCERT := $(CERTDIR)/proxy-server.pem
+PROXYSSLCONF := $(CONFDIR)/proxy-ssl.conf
+
+CFLAGS += $(DEFINES)
+
 OBJS += $(MODS:%=%.o)
-MODDIR := $(LIBDIR)/modules
 CONF_TARGET:= $(CONFDIR_REAL)/$(CONFFILE)
 PERM_TARGET:= $(PERMDIR_REAL)/$(PERMFILE)
-DEFINES:='-DPROXY_VERSION="$(VERSION)"' '-DCDIR="$(CONFDIR)"' '-DCFILE="$(CONFFILE)"'
-DEFINES+='-DMDIR="$(MODDIR)"' '-DPDIR="$(PERMDIR)"' '-DPFILE="$(PERMFILE)"'
 VPATH = src
 
-# Add -g below for debug/GDB symbols
-CFLAGS+= $(DEFINES) -Wall -O2 -D_REENTRANT -fPIC -Isrc/include -I/usr/include/openssl -I-
 
 # For printing only
 SRCS := $(MODS:%=%.c)
@@ -82,8 +90,8 @@ SERIAL=`date "+%Y%m%d%H%M%S"`
 cert:
 	if [ ! -f $(PROXYCERT) ]; then      \
 		umask 77 ; \
-                PEM1=`/bin/mktemp /tmp/openssl.XXXXXX` ; \
-                PEM2=`/bin/mktemp /tmp/openssl.XXXXXX` ; \
+                PEM1=`$(MKTEMP) /tmp/openssl.XXXXXX` ; \
+                PEM2=`$(MKTEMP) /tmp/openssl.XXXXXX` ; \
 		if [ ! -f $(PROXYSSLCONF) ]; then \
 			install ./configs/ssl.conf $(PROXYSSLCONF); \
 		fi; \
@@ -113,8 +121,8 @@ certificate:
         fi; \
         if [ "$$createcert" = "1" ]; then  \
 		umask 77 ; \
-                PEM1=`/bin/mktemp /tmp/openssl.XXXXXX` ; \
-                PEM2=`/bin/mktemp /tmp/openssl.XXXXXX` ; \
+                PEM1=`$(MKTEMP) /tmp/openssl.XXXXXX` ; \
+                PEM2=`$(MKTEMP) /tmp/openssl.XXXXXX` ; \
 		if [ ! -f $(PROXYSSLCONF) ]; then \
 			install ./configs/ssl.conf $(PROXYSSLCONF); \
 		fi; \
@@ -135,10 +143,10 @@ install: uninstall all
 	install $(SOBJS) $(MODDIR)
 	install -d $(CONFDIR_REAL)
 	if [ ! -f $(CONF_TARGET) ]; then \
-		install $(CONFFILE) $(CONF_TARGET); \
+		install ./configs/$(CONFFILE) $(CONF_TARGET); \
 	fi
 	if [ ! -f $(PERM_TARGET) ]; then \
-		install $(PERMFILE) $(PERM_TARGET); \
+		install ./configs/$(PERMFILE) $(PERM_TARGET); \
 	fi
 	@echo "Installation Complete!"
 
-- 
cgit