diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-02-11 17:12:05 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-02-11 17:12:05 +0000 |
| commit | 6aa6819c41b7c95876e0af86b5598ce7a5be989d (patch) | |
| tree | 2b2ed5b484ce6f72836b750a9cdda7a0eafc7eed /res | |
| parent | 52c23802d6c978f70d1770bfcbcb23c1f019742c (diff) | |
use auto-build for apps, simplify variable setting
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9564 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
| -rw-r--r-- | res/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/res/Makefile b/res/Makefile index bbbabf396..01cdc4017 100644 --- a/res/Makefile +++ b/res/Makefile @@ -3,7 +3,7 @@ # # Makefile for resource modules # -# Copyright (C) 1999-2005, Digium +# Copyright (C) 1999-2006, Digium # # Mark Spencer <markster@digium.com> # @@ -13,7 +13,7 @@ MODS:=$(patsubst %.c,%.so,$(wildcard res_*.c)) -ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),) +ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),) MODS:=$(filter-out res_odbc.so,$(MODS)) MODS:=$(filter-out res_config_odbc.so,$(MODS)) else @@ -26,7 +26,7 @@ ifneq ($(NOCRYPTO),yes) MODS:=$(filter-out res_crypto.so,$(MODS)) endif -OSPLIB=$(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libosptk.a)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a) +OSPLIB:=$(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libosptk.a $(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a) ifeq (${OSPLIB},) MODS:=$(filter-out res_osp.so,$(MODS)) endif |