Fix building of modules under cygwin.

After this commit we can actually load modules under windows,
and we can start debugging more interesting problems related
to the load order and functionality of modules.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89454 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules
index 54113de..988f484 100644 (file)
--- a/Makefile.moddir_rules
+++ b/Makefile.moddir_rules
@@ -66,9 +66,8 @@ _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
+  LIBS+=-L../main -lasterisk -L../res $($@_LIBS)
   # additional libraries in res/
-  LIBS_RES:= -lres_monitor -lres_adsi -lres_features
 endif
 endif
 

diff --git a/apps/Makefile b/apps/Makefile
index d0e9215..0f2fb77 100644 (file)
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -39,3 +39,9 @@ endif
 all: _all
 
 include $(ASTTOPDIR)/Makefile.moddir_rules
+
+ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
+  LIBS+= -lres_features.so -lres_ael_share.so -lres_monitor.so -lres_speech.so
+  LIBS+= -lres_smdi.so
+endif
+

diff --git a/channels/Makefile b/channels/Makefile
index 53c7790..bfe4f91 100644 (file)
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -64,6 +64,10 @@ all: _all
 
 include $(ASTTOPDIR)/Makefile.moddir_rules
 
+ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
+  LIBS+= -lres_monitor.so -lres_features.so
+endif
+
 clean::
        rm -f gentone
        $(MAKE) -C misdn clean

diff --git a/pbx/Makefile b/pbx/Makefile
index 6a229a8..24c4a8e 100644 (file)
--- a/pbx/Makefile
+++ b/pbx/Makefile
@@ -25,6 +25,10 @@ all: _all
 
 include $(ASTTOPDIR)/Makefile.moddir_rules
 
+ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
+  LIBS+= -lres_ael_share.so -lres_monitor.so
+endif
+
 clean::
        rm -f ael/*.o
 

diff --git a/res/Makefile b/res/Makefile
index 0d0863d..4912a1d 100644 (file)
--- a/res/Makefile
+++ b/res/Makefile
@@ -25,6 +25,13 @@ all: _all
 
 include $(ASTTOPDIR)/Makefile.moddir_rules
 
+ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
+  # order-only dependency: build res_monitor before res_features
+  res_features.so: | res_monitor.so
+  # res_features uses some functions from res_monitor
+  res_features.so_LIBS:= -lres_monitor.so
+endif
+
 ael/ael_lex.o: ael/ael_lex.c ../include/asterisk/ael_structs.h ael/ael.tab.h
 ael/ael_lex.o: ASTCFLAGS+=-I. -Iael