[asterisk-commits] branch group/autoconf_and_menuselect r19938 - in /team/group/autoconf_and_men...

[asterisk-commits at lists.digium.com]

Author: russell
Date: Thu Apr 13 18:27:20 2006
New Revision: 19938

URL: http://svn.digium.com/view/asterisk?rev=19938&view=rev
Log:
- remove the OSP_SUPPORT define that is no longer used
- updates to make the res modules build with the info from autoconf

Modified:
    team/group/autoconf_and_menuselect/Makefile
    team/group/autoconf_and_menuselect/res/Makefile

Modified: team/group/autoconf_and_menuselect/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/Makefile?rev=19938&r1=19937&r2=19938&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/Makefile (original)
+++ team/group/autoconf_and_menuselect/Makefile Thu Apr 13 18:27:20 2006
@@ -264,14 +264,6 @@
 
 ifeq ($(PROC),ppc)
   ASTCFLAGS+=-fsigned-char
-endif
-
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h),)
-  ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/local/include/osp
-else
-  ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
-    ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/include/osp
-  endif
 endif
 
 ifeq ($(OSARCH),FreeBSD)

Modified: team/group/autoconf_and_menuselect/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/res/Makefile?rev=19938&r1=19937&r2=19938&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/res/Makefile (original)
+++ team/group/autoconf_and_menuselect/res/Makefile Thu Apr 13 18:27:20 2006
@@ -74,6 +74,9 @@
 res_crypto.so: res_crypto.o
 	$(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(SSL_LIB)
 
+res_crypto.o: res_crypto.c
+	$(CC) -c -o $@ $(CFLAGS) $(SSL_INCLUDE) $<
+
 clean-depend:
 	rm -f .depend
 
@@ -81,10 +84,16 @@
 	rm -f *.so *.o
 
 res_odbc.so: res_odbc.o
-	$(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) -lodbc
+	$(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(ODBC_LIB) 
+
+res_odbc.o: res_odbc.c
+	$(CC) -c -o $@ $(CFLAGS) $(ODBC_INCLUDE) $<
 
 res_osp.so: res_osp.o
-	$(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(OSP_LIB) $(SSL_LIB)
+	$(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(OSPTK_LIB)
+
+res_osp.o: res_osp.c
+	$(CC) -c -o $@ $(CFLAGS) $(OSPTK_INCLUDE) $<
 
 %.so : %.o
 	$(CC) -o $@ $(SOLINK) $(CYGSOLINK) $< $(CYGSOLIB)
@@ -95,11 +104,17 @@
 res_config_odbc.so: res_config_odbc.o
 	$(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(CYG_RES_CONFIG_ODBC_LIB)
 
+res_config_odbc.o: res_config_odbc.c
+	$(CC) -c -o $@ $(CFLAGS) $(ODBC_INCLUDE) $<
+
 res_snmp.so: res_snmp.o snmp/agent.o
 	$(CC) $(SOLINK) $(SNMP_LDFLAGS) -o $@ $(CYGSOLINK) res_snmp.o snmp/agent.o $(CYGSOLIB) $(SNMP_LDLIBS)
 
 res_config_pgsql.so: res_config_pgsql.o
-	$(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) -lpq -lz $(MLFLAGS)
+	$(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(PGSQL_LIB)
+
+res_config_pgsql.o: res_config_pgsql.c
+	$(CC) -c -o $@ $(CFLAGS) $(PGSQL_INCLUDE) $<
 
 ifneq ($(wildcard .depend),)
   include .depend