[svn-commits] dlee: trunk r372931 - in /trunk: ./ main/Makefile

[SVN commits to the Digium repositories]

Author: dlee
Date: Wed Sep 12 09:22:54 2012
New Revision: 372931

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=372931
Log:
Fixed r372696 when configured --disable-asteriskssl; properly install libasteriskssl.dylib on OS X.

I didn't realize that libasteriskssl.c was still compiled, even when you
disable asteriskssl; it simple gets statically linked into asterisk.
........

Merged revisions 372930 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/main/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/main/Makefile?view=diff&rev=372931&r1=372930&r2=372931
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Wed Sep 12 09:22:54 2012
@@ -187,14 +187,14 @@
 
 $(OBJS): _ASTCFLAGS+=-DAST_MODULE=\"core\"
 
+libasteriskssl.o: _ASTCFLAGS+=$(OPENSSL_INCLUDE)
+
 ifeq ($(AST_ASTERISKSSL),yes)
 # The ABI *version* of the asteriskssl library; don't change this unless there truly is a
 # non-backwards-compatible ABI change in the library
 ASTSSL_SO_VERSION=1
 
 ASTSSL_LDLIBS=-L. -lasteriskssl
-
-libasteriskssl.o: _ASTCFLAGS+=$(OPENSSL_INCLUDE)
 
 ifeq ($(findstring darwin,$(OSARCH)),) # not Darwin
 ASTSSL_LIB:=libasteriskssl.so
@@ -257,8 +257,12 @@
 bininstall:
 	$(INSTALL) -m 755 $(MAIN_TGT) "$(DESTDIR)$(ASTSBINDIR)/"
 ifeq ($(AST_ASTERISKSSL),yes)
+ifeq ($(findstring darwin,$(OSARCH)),) # not Darwin
 	$(INSTALL) -m 755 $(ASTSSL_LIB).$(ASTSSL_SO_VERSION) "$(DESTDIR)$(ASTLIBDIR)/"
 	$(LN) -sf "$(DESTDIR)$(ASTLIBDIR)/$(ASTSSL_LIB).$(ASTSSL_SO_VERSION)" "$(DESTDIR)$(ASTLIBDIR)/$(ASTSSL_LIB)"
+else # Darwin
+	$(INSTALL) -m 755 $(ASTSSL_LIB) "$(DESTDIR)$(ASTLIBDIR)/"
+endif
 ifneq ($(LDCONFIG),)
 	$(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(ASTLIBDIR)/"
 endif