[svn-commits] rizzo: trunk r89443 - in /trunk: Makefile Makefile.moddir_rules main/Makefile

[SVN commits to the Digium repositories]

Author: rizzo
Date: Tue Nov 20 01:42:38 2007
New Revision: 89443

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89443
Log:
initial makefile changes to build loadable modules under cygwin
(not complete yet - still need to sort out dependecies on res_*)


Modified:
    trunk/Makefile
    trunk/Makefile.moddir_rules
    trunk/main/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?view=diff&rev=89443&r1=89442&r2=89443
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Nov 20 01:42:38 2007
@@ -277,10 +277,6 @@
   SOLINK=-shared -fpic -L/usr/local/ssl/lib
 endif
 
-ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
-  SOLINK=-Xlinker -r
-endif
-
 # This is used when generating the doxygen documentation
 ifneq ($(DOT),:)
   HAVEDOT=yes
@@ -298,7 +294,7 @@
 endif
 
 # comment to print directories during submakes
-PRINT_DIR:= --no-print-directory
+PRINT_DIR?= --no-print-directory
 
 all: _all
 	@echo " +--------- Asterisk Build Complete ---------+"  

Modified: trunk/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/trunk/Makefile.moddir_rules?view=diff&rev=89443&r1=89442&r2=89443
==============================================================================
--- trunk/Makefile.moddir_rules (original)
+++ trunk/Makefile.moddir_rules Tue Nov 20 01:42:38 2007
@@ -63,6 +63,13 @@
 
 ifneq ($(LOADABLE_MODS),)
 _all: $(LOADABLE_MODS:%=%.so)
+ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
+  # linker options and extra libraries for cygwin
+  SOLINK=-Wl,--out-implib=lib$@.a -shared
+  LIBS+=-L../main -lasterisk -L../res
+  # additional libraries in res/
+  LIBS_RES:= -lres_monitor -lres_adsi -lres_features
+endif
 endif
 
 ifneq ($(EMBEDDED_MODS),)

Modified: trunk/main/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/main/Makefile?view=diff&rev=89443&r1=89442&r2=89443
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Tue Nov 20 01:42:38 2007
@@ -87,7 +87,7 @@
 
 ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
   AST_LIBS+=-lminires -ldl
-  ASTLINK+= -shared -Wl,--out-implib,asterisk.dll
+  ASTLINK+= -shared -Wl,--out-implib,libasterisk.a
 endif
 ifeq ($(OSARCH),NetBSD)
   AST_LIBS+=-lpthread -lcrypto -lm -L/usr/pkg/lib $(EDITLINE_LIB)