Unbreak res/Makefile (issue #6891 as reported by casper)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@17661 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
ef6b50b706
commit
1001cc0656
16
res/Makefile
16
res/Makefile
|
@ -43,7 +43,6 @@ else
|
||||||
endif
|
endif
|
||||||
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),)
|
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))
|
MODS:=$(filter-out res_config_pgsql.so,$(MODS))
|
||||||
endif
|
endif
|
||||||
|
@ -54,16 +53,12 @@ else
|
||||||
SNMP_LDLIBS+=$(shell net-snmp-config --agent-libs)
|
SNMP_LDLIBS+=$(shell net-snmp-config --agent-libs)
|
||||||
endif
|
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 (${WITH_SMDI},)
|
ifeq (${WITH_SMDI},)
|
||||||
MODS:=$(filter-out res_smdi.so,$(MODS))
|
MODS:=$(filter-out res_smdi.so,$(MODS))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
MLFLAGS=
|
||||||
|
|
||||||
# Now, go find postgresql libraries
|
# Now, go find postgresql libraries
|
||||||
ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql),)
|
ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql),)
|
||||||
CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/include/postgresql
|
CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/include/postgresql
|
||||||
|
@ -87,7 +82,7 @@ endif
|
||||||
|
|
||||||
ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include),)
|
ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include),)
|
||||||
CFLAGS+=-I$(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
|
endif
|
||||||
|
|
||||||
ifneq ($(wilcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql),)
|
ifneq ($(wilcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql),)
|
||||||
|
@ -98,7 +93,6 @@ ifneq ($(wilcard $(CROSS_COMPILE_TARGET)/usr/lib/libpq.so),)
|
||||||
MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib
|
MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
ifeq (${OSARCH},CYGWIN)
|
ifeq (${OSARCH},CYGWIN)
|
||||||
CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
|
CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
|
||||||
CYGSOLIB=-L.. -L. -lasterisk.dll
|
CYGSOLIB=-L.. -L. -lasterisk.dll
|
||||||
|
@ -111,8 +105,6 @@ CRYPTO_LIBS=-lssl -lcrypto
|
||||||
|
|
||||||
CFLAGS+=
|
CFLAGS+=
|
||||||
|
|
||||||
MLFLAGS=
|
|
||||||
|
|
||||||
ifndef WITHOUT_ZAPTEL
|
ifndef WITHOUT_ZAPTEL
|
||||||
ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),)
|
ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),)
|
||||||
CFLAGS+=-DZAPATA_MOH
|
CFLAGS+=-DZAPATA_MOH
|
||||||
|
@ -179,8 +171,6 @@ res_snmp.so: res_snmp.o snmp/agent.o
|
||||||
res_config_pgsql.so: res_config_pgsql.o
|
res_config_pgsql.so: res_config_pgsql.o
|
||||||
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lpq -lz $(MLFLAGS)
|
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lpq -lz $(MLFLAGS)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ifneq ($(wildcard .depend),)
|
ifneq ($(wildcard .depend),)
|
||||||
include .depend
|
include .depend
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue