diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-11 17:12:05 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-11 17:12:05 +0000 |
| commit | 32337b7e7fba87773646a89fa4255eb515db542c (patch) | |
| tree | 2b2ed5b484ce6f72836b750a9cdda7a0eafc7eed /res/Makefile | |
| parent | dda3cfe4a0c9cd9db7ab07338e4e002119bffe8c (diff) | |
use auto-build for apps, simplify variable setting
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9564 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/Makefile')
| -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 |