[asterisk-commits] trunk r17661 - /trunk/res/Makefile

[asterisk-commits at lists.digium.com]

Author: file
Date: Wed Apr  5 13:37:29 2006
New Revision: 17661

URL: http://svn.digium.com/view/asterisk?rev=17661&view=rev
Log:
Unbreak res/Makefile (issue #6891 as reported by casper)

Modified:
    trunk/res/Makefile

Modified: trunk/res/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/res/Makefile?rev=17661&r1=17660&r2=17661&view=diff
==============================================================================
--- trunk/res/Makefile (original)
+++ trunk/res/Makefile Wed Apr  5 13:37:29 2006
@@ -43,15 +43,8 @@
   endif
 endif
 
-
 ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include $(CROSS_COMPILE_TARGET)/usr/include/pgsql $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql $(CROSS_COMPILE_TARGET)/opt/pgsql/include $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),)
   MODS:=$(filter-out res_config_pgsql.so,$(MODS))
-endif
-
-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/net-snmp/net-snmp-config.h),)
-  MODS:=$(filter-out res_snmp.so,$(MODS))
-else
-  SNMP_LDLIBS+=$(shell net-snmp-config --agent-libs)
 endif
 
 ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/net-snmp/net-snmp-config.h),)
@@ -63,6 +56,8 @@
 ifeq (${WITH_SMDI},)
   MODS:=$(filter-out res_smdi.so,$(MODS))
 endif
+
+MLFLAGS=
 
 # Now, go find postgresql libraries
 ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql),)
@@ -87,7 +82,7 @@
 
 ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include),)
   CFLAGS+=-I$(CROSS_COMPILE_TARGET)/opt/pgsql/include
-  MLFLAGS+=-L$(CROSS_COMPILE_TARGET) /opt/pgsql/lib
+  MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/opt/pgsql/lib
 endif
 
 ifneq ($(wilcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql),)
@@ -97,7 +92,6 @@
 ifneq ($(wilcard $(CROSS_COMPILE_TARGET)/usr/lib/libpq.so),)
   MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib
 endif
-
 
 ifeq (${OSARCH},CYGWIN)
   CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
@@ -110,8 +104,6 @@
 CRYPTO_LIBS=-lssl -lcrypto
 
 CFLAGS+=
-
-MLFLAGS=
 
 ifndef WITHOUT_ZAPTEL
 ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),)
@@ -179,8 +171,6 @@
 res_config_pgsql.so: res_config_pgsql.o
 	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lpq -lz $(MLFLAGS)
 
-
-
 ifneq ($(wildcard .depend),)
   include .depend
 endif