[asterisk-commits] branch group/autoconf_and_menuselect r21771 - in
/team/group/autoconf_and_men...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Thu Apr 20 12:50:17 MST 2006
Author: russell
Date: Thu Apr 20 14:49:56 2006
New Revision: 21771
URL: http://svn.digium.com/view/asterisk?rev=21771&view=rev
Log:
remove all of the stuff in the Makefiles that were added to support building on
Cygwin because these additions are not going to survive all of the changes being
made in this branch as well as the recent loader changes. (These changes were
run by MikeJ in advance, the developer of the cygwin support.)
Modified:
team/group/autoconf_and_menuselect/Makefile
team/group/autoconf_and_menuselect/apps/Makefile
team/group/autoconf_and_menuselect/cdr/Makefile
team/group/autoconf_and_menuselect/channels/Makefile
team/group/autoconf_and_menuselect/codecs/Makefile
team/group/autoconf_and_menuselect/codecs/gsm/Makefile
team/group/autoconf_and_menuselect/codecs/ilbc/Makefile
team/group/autoconf_and_menuselect/codecs/lpc10/Makefile
team/group/autoconf_and_menuselect/formats/Makefile
team/group/autoconf_and_menuselect/funcs/Makefile
team/group/autoconf_and_menuselect/pbx/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=21771&r1=21770&r2=21771&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/Makefile (original)
+++ team/group/autoconf_and_menuselect/Makefile Thu Apr 20 14:49:56 2006
@@ -293,15 +293,6 @@
INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include
endif
-ifeq ($(findstring CYGWIN,$(OSARCH)),CYGWIN)
- CYGLOADER=cygwin_a
- OSARCH=CYGWIN
- ASTOBJ=-shared -o asterisk.dll -Wl,--out-implib=libasterisk.dll.a -Wl,--export-all-symbols
- ASTLINK=
- LIBS+=-lpthread -lncurses -lm -lresolv
- ASTSBINDIR=$(MODULES_DIR)
-endif
-
LIBEDIT=editline/libedit.a
ASTERISKVERSION:=$(shell build_tools/make_version .)
@@ -525,7 +516,7 @@
cygwin_a:
$(MAKE) -C cygwin all
-asterisk: $(CYGLOADER) editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
+asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
build_tools/make_build_h > include/asterisk/build.h.tmp
if cmp -s include/asterisk/build.h.tmp include/asterisk/build.h ; then echo ; else \
mv include/asterisk/build.h.tmp include/asterisk/build.h ; \
Modified: team/group/autoconf_and_menuselect/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/apps/Makefile?rev=21771&r1=21770&r2=21771&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/apps/Makefile (original)
+++ team/group/autoconf_and_menuselect/apps/Makefile Thu Apr 20 14:49:56 2006
@@ -13,17 +13,11 @@
MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%.so,$(wildcard app_*.c)))
-ifneq (${WITH_SMDI},)
+ifneq ($(WITH_SMDI),)
CFLAGS+=-DWITH_SMDI
endif
-ifeq (${OSARCH},CYGWIN)
- CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
- CYGSOLIB=-L.. -L. -L../res -lasterisk.dll -lres_features.so -lres_adsi.so -lres_monitor.so
- MODS:=$(filter-out app_sms.so,$(MODS))
-else
- CFLAGS+=-fPIC
-endif
+CFLAGS+=-fPIC
# If you have UnixODBC you can use ODBC voicemail
# storage
@@ -43,13 +37,13 @@
rm -f *.so *.o
%.so: %.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
+ $(CC) $(SOLINK) -o $@ $<
app_rpt.so: app_rpt.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(ZAPTEL_LIB)
+ $(CC) $(SOLINK) -o $@ $< $(ZAPTEL_LIB)
app_rpt.o: app_rpt.c
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(ZAPTEL_INCLUDE)
+ $(CC) $(SOLINK) -o $@ $< $(ZAPTEL_INCLUDE)
install: all
for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
Modified: team/group/autoconf_and_menuselect/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/cdr/Makefile?rev=21771&r1=21770&r2=21771&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/cdr/Makefile (original)
+++ team/group/autoconf_and_menuselect/cdr/Makefile Thu Apr 20 14:49:56 2006
@@ -13,12 +13,7 @@
MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.c,%.so,$(wildcard cdr_*.c)))
-ifeq ($(OSARCH),CYGWIN)
- CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
- CYGSOLIB=-L.. -L. -lasterisk.dll
-else
- CFLAGS+=-fPIC
-endif
+CFLAGS+=-fPIC
#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
#This works for even old (2.96) versions of gcc and provides a small boost either way.
@@ -56,28 +51,28 @@
rm -f *.so *.o
%.so : %.o
- $(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB)
+ $(CC) $(SOLINK) -o $@ $<
cdr_odbc.so: cdr_odbc.o
- $(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(ODBC_LIB)
+ $(CC) $(SOLINK) -o $@ $< $(ODBC_LIB)
cdr_odbc.o: cdr_odbc.c
$(CC) -c -o $@ $(CFLAGS) $(ODBC_INCLUDE) $<
cdr_tds.so: cdr_tds.o
- $(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(TDS_LIB)
+ $(CC) $(SOLINK) -o $@ $< $(TDS_LIB)
cdr_tds.o: cdr_tds.c
$(CC) -c -o $@ $(CFLAGS) $(TDS_INCLUDE) $<
cdr_pgsql.so: cdr_pgsql.o
- $(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(PGSQL_LIB)
+ $(CC) $(SOLINK) -o $@ $< $(PGSQL_LIB)
cdr_pgsql.o: cdr_pgsql.c
$(CC) -c -o $@ $(CFLAGS) $(PGSQL_INCLUDE) $<
cdr_sqlite.so: cdr_sqlite.o
- $(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(SQLITE_LIB)
+ $(CC) $(SOLINK) -o $@ $< $(SQLITE_LIB)
cdr_sqlite.o: cdr_sqlite.c
$(CC) -c -o $@ $(CFLAGS) $(SQLITE_INCLUDE) $<
Modified: team/group/autoconf_and_menuselect/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/channels/Makefile?rev=21771&r1=21770&r2=21771&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/channels/Makefile (original)
+++ team/group/autoconf_and_menuselect/channels/Makefile Thu Apr 20 14:49:56 2006
@@ -22,12 +22,6 @@
PTLIB=-lpt_linux_x86_r
H323LIB=-lh323_linux_x86_r
CHANH323LIB=-ldl
-endif
-
-ifeq ($(OSARCH),CYGWIN)
- CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
- CYGSOLIB=-L.. -L. -L../res -lasterisk.dll -lres_features.so
- CYG_CHAN_AGENT=-lres_monitor.so
endif
ifeq ($(PROC),sparc64)
@@ -68,9 +62,7 @@
CFLAGS+=-DCRYPTO
-ifneq ($(OSARCH),CYGWIN)
- CFLAGS+=-fPIC
-endif
+CFLAGS+=-fPIC
ZAPDIR=/usr/lib
@@ -92,7 +84,7 @@
rm -f busy.h ringtone.h gentone gentone-ulaw
%.so : %.o
- $(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB)
+ $(CC) $(SOLINK) -o $@ $<
ifneq ($(wildcard .depend),)
include .depend
@@ -130,16 +122,13 @@
endif
chan_iax2.so: chan_iax2.o iax2-parser.o iax2-provision.o
- $(CC) $(SOLINK) -o $@ $(CYGSOLINK) chan_iax2.o iax2-parser.o iax2-provision.o $(CYGSOLIB)
+ $(CC) $(SOLINK) -o $@ $< iax2-parser.o iax2-provision.o
chan_zap.so: chan_zap.o
$(CC) $(SOLINK) -o $@ $< $(PRI_LIB) $(MFCR2_LIB) $(ZAPTEL_LIB)
chan_zap.o: chan_zap.c
$(CC) -c -o $@ $(CFLAGS) $(ZAPTEL_INCLUDE) $<
-
-chan_agent.so: chan_agent.o
- $(CC) $(SOLINK) -o $@ $(CYGSOLINK) chan_agent.o $(CYGSOLIB) $(CYG_CHAN_AGENT)
chan_alsa.so: chan_alsa.o
$(CC) $(SOLINK) -o $@ $< $(ASOUND_LIB)
Modified: team/group/autoconf_and_menuselect/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/codecs/Makefile?rev=21771&r1=21770&r2=21771&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/codecs/Makefile (original)
+++ team/group/autoconf_and_menuselect/codecs/Makefile Thu Apr 20 14:49:56 2006
@@ -13,12 +13,7 @@
MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.c,%.so,$(wildcard codec_*.c)))
-ifeq (${OSARCH},CYGWIN)
- CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
- CYGSOLIB=-L.. -L. -lasterisk.dll
-else
- CFLAGS+=-fPIC
-endif
+CFLAGS+=-fPIC
ifeq ($(wildcard g723.1/coder.c),)
MODS:=$(filter-out codec_g723_1.so,$(MODS))
@@ -33,10 +28,10 @@
SPEEX_PATH:=/usr/local/include /usr/include /usr/include/speex /usr/local/include/speex
SPEEX_SYSTEM_HEADERS:=$(firstword $(wildcard $(SPEEX_PATH:%=$(CROSS_COMPILE_TARGET)%/speex.h)))
-ifeq (${SPEEX_SYSTEM_HEADERS},)
+ifeq ($(SPEEX_SYSTEM_HEADERS),)
MODS:=$(filter-out codec_speex.so,$(MODS))
else
- CFLAGS+=-I$(subst /speex.h,,${SPEEX_SYSTEM_HEADERS})
+ CFLAGS+=-I$(subst /speex.h,,$(SPEEX_SYSTEM_HEADERS))
LIBSPEEX=-lspeex -lm
endif
@@ -89,28 +84,28 @@
$(MAKE) -C ilbc all
codec_ilbc.so: codec_ilbc.o $(LIBILBC)
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(LIBILBC)
+ $(CC) $(SOLINK) -o $@ $< $(LIBILBC)
codec_g723_1.so : codec_g723_1.o $(LIBG723)
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(LIBG723)
+ $(CC) $(SOLINK) -o $@ $< $(LIBG723)
codec_g723_1b.o : codec_g723_1.c
$(CC) -c -o $@ $(CFLAGS) -DANNEX_B -Dsingle $<
codec_g723_1b.so : codec_g723_1b.o $(LIBG723B)
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(LIBG723B) -lm
+ $(CC) $(SOLINK) -o $@ $< $(LIBG723B) -lm
codec_gsm.so: codec_gsm.o $(LIBGSMT)
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(LIBGSM)
+ $(CC) $(SOLINK) -o $@ $< $(LIBGSM)
codec_speex.so: codec_speex.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(LIBSPEEX)
+ $(CC) $(SOLINK) -o $@ $< $(LIBSPEEX)
codec_lpc10.so: codec_lpc10.o $(LIBLPC10)
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(LIBLPC10) -lm
+ $(CC) $(SOLINK) -o $@ $< $(LIBLPC10) -lm
%.so : %.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
+ $(CC) $(SOLINK) -o $@ $<
ifneq ($(wildcard .depend),)
include .depend
Modified: team/group/autoconf_and_menuselect/codecs/gsm/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/codecs/gsm/Makefile?rev=21771&r1=21770&r2=21771&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/codecs/gsm/Makefile (original)
+++ team/group/autoconf_and_menuselect/codecs/gsm/Makefile Thu Apr 20 14:49:56 2006
@@ -73,10 +73,7 @@
CC ?= gcc
CCFLAGS += -c -DNeedFunctionPrototypes=1 -funroll-loops $(OPTIMIZE)
-ifneq ($(findstring CYGWIN,${OSARCH}),CYGWIN)
CCFLAGS += -fPIC
-endif
-
LD = $(CC)
Modified: team/group/autoconf_and_menuselect/codecs/ilbc/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/codecs/ilbc/Makefile?rev=21771&r1=21770&r2=21771&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/codecs/ilbc/Makefile (original)
+++ team/group/autoconf_and_menuselect/codecs/ilbc/Makefile Thu Apr 20 14:49:56 2006
@@ -1,8 +1,6 @@
ARCH=$(PROC)
CFLAGS+=-Wall -O3 -funroll-loops
-ifneq (${OSARCH},CYGWIN)
CFLAGS += -fPIC
-endif
LIB=libilbc.a
OBJS= anaFilter.o iCBSearch.o packing.o \
Modified: team/group/autoconf_and_menuselect/codecs/lpc10/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/codecs/lpc10/Makefile?rev=21771&r1=21770&r2=21771&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/codecs/lpc10/Makefile (original)
+++ team/group/autoconf_and_menuselect/codecs/lpc10/Makefile Thu Apr 20 14:49:56 2006
@@ -23,9 +23,7 @@
WARNINGS = -Wall -Wno-comment -Wno-error
CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS)
-ifneq (${OSARCH},CYGWIN)
CFLAGS += -fPIC
-endif
#CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
#fix for PPC processors and ALPHA, And UltraSparc too
Modified: team/group/autoconf_and_menuselect/formats/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/formats/Makefile?rev=21771&r1=21770&r2=21771&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/formats/Makefile (original)
+++ team/group/autoconf_and_menuselect/formats/Makefile Thu Apr 20 14:49:56 2006
@@ -15,12 +15,7 @@
GSMLIB=../codecs/gsm/lib/libgsm.a
-ifeq (${OSARCH},CYGWIN)
- CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
- CYGSOLIB=-L.. -L. -lasterisk.dll
-else
- CFLAGS+=-fPIC
-endif
+CFLAGS+=-fPIC
all: depend $(MODS)
@@ -31,20 +26,20 @@
rm -f *.so *.o
%.so : %.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
+ $(CC) $(SOLINK) -o $@ $<
ifneq ($(wildcard .depend),)
include .depend
endif
format_mp3.so : format_mp3.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lm
+ $(CC) $(SOLINK) -o $@ $< -lm
format_ogg_vorbis.so : format_ogg_vorbis.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(OGG_LIB) $(VORBIS_LIB)
+ $(CC) $(SOLINK) -o $@ $< $(OGG_LIB) $(VORBIS_LIB)
format_ogg_vorbis.o: format_ogg_vorbis.c
- $(CC) -c -o $@ ${CFLAGS} $(OGG_INCLUDE) $(VORBIS_INCLUDE) $<
+ $(CC) -c -o $@ $(CFLAGS) $(OGG_INCLUDE) $(VORBIS_INCLUDE) $<
install: all
for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
Modified: team/group/autoconf_and_menuselect/funcs/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/funcs/Makefile?rev=21771&r1=21770&r2=21771&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/funcs/Makefile (original)
+++ team/group/autoconf_and_menuselect/funcs/Makefile Thu Apr 20 14:49:56 2006
@@ -24,12 +24,7 @@
endif
endif
-ifeq ($(OSARCH),CYGWIN)
- CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
- CYGSOLIB=-L.. -L. -lasterisk.dll
-else
- CFLAGS+=-fPIC
-endif
+CFLAGS+=-fPIC
all: $(MODS)
@@ -40,16 +35,16 @@
rm -f *.so *.o
%.so : %.o
- $(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB)
+ $(CC) $(SOLINK) -o $@ $<
func_curl.so: func_curl.o
- $(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(CURL_LIB)
+ $(CC) $(SOLINK) -o $@ $< $(CURL_LIB)
func_curl.o: func_curl.c
$(CC) -c -o $@ $(CFLAGS) $(CURL_INCLUDE) $<
func_odbc.so: func_odbc.o
- $(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(ODBC_LIB)
+ $(CC) $(SOLINK) -o $@ $< $(ODBC_LIB)
func_odbc.o: func_odbc.c
$(CC) -c -o $@ $(CFLAGS) $(ODBC_INCLUDE) $<
Modified: team/group/autoconf_and_menuselect/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/pbx/Makefile?rev=21771&r1=21770&r2=21771&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/pbx/Makefile (original)
+++ team/group/autoconf_and_menuselect/pbx/Makefile Thu Apr 20 14:49:56 2006
@@ -17,12 +17,7 @@
KDE_FLAGS=-I$(KDEDIR)/include -I$(KDEDIR)/include/kde -I$(QTDIR)/include
KDE_LIBS=-L$(KDEDIR)/lib -L$(QTDIR)/lib -lqt -lkdecore -lkdeui
-ifeq (${OSARCH},CYGWIN)
- CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
- CYGSOLIB=-L.. -L. -L../res -lasterisk.dll
-else
- CFLAGS+=-fPIC
-endif
+CFLAGS+=-fPIC
KDE_CONSOLE_OBJS=pbx_kdeconsole_main.o pbx_kdeconsole.o
@@ -49,17 +44,17 @@
pbx_kdeconsole.so: $(KDE_CONSOLE_OBJS)
$(CC) $(SOLINK) -o $@ $(KDE_CONSOLE_OBJS) $(KDE_LIBS)
-pbx_dundi.so: dundi-parser.o pbx_dundi.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o $(Z_LIB) ${CYGSOLIB}
+pbx_dundi.so: pbx_dundi.o dundi-parser.o
+ $(CC) $(SOLINK) -o $@ $< dundi-parser.o $(Z_LIB)
pbx_dundi.o: pbx_dundi.c
- $(CC) -c -o $@ ${CFLAGS} $(Z_INCLUDE) $<
+ $(CC) -c -o $@ $(CFLAGS) $(Z_INCLUDE) $<
%.moc : %.h
$(MOC) $< -o $@
%.so : %.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
+ $(CC) $(SOLINK) -o $@ $<
ifneq ($(wildcard .depend),)
include .depend
Modified: team/group/autoconf_and_menuselect/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/res/Makefile?rev=21771&r1=21770&r2=21771&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/res/Makefile (original)
+++ team/group/autoconf_and_menuselect/res/Makefile Thu Apr 20 14:49:56 2006
@@ -34,21 +34,11 @@
SNMP_LDLIBS+=$(shell net-snmp-config --agent-libs)
endif
-ifeq ($(OSARCH),CYGWIN)
- CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
- CYGSOLIB=-L.. -L. -lasterisk.dll
- CYG_RES_CONFIG_ODBC_LIB=-lres_odbc.so
- CYG_RES_FEATURES_LIB=-lres_adsi.so -lres_monitor.so
-endif
#
# Work around buggy RedHat 9.0
#
-ifeq ($(OSARCH),CYGWIN)
-CFLAGS+=-DOPENSSL_NO_KRB5
-else
CFLAGS+=-DOPENSSL_NO_KRB5 -fPIC
-endif
all: depend $(MODS)
@@ -72,7 +62,7 @@
uninstall:
res_crypto.so: res_crypto.o
- $(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(SSL_LIB)
+ $(CC) $(SOLINK) -o $@ $< $(SSL_LIB)
res_crypto.o: res_crypto.c
$(CC) -c -o $@ $(CFLAGS) $(SSL_INCLUDE) $<
@@ -84,34 +74,28 @@
rm -f *.so *.o
res_odbc.so: res_odbc.o
- $(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(ODBC_LIB)
+ $(CC) $(SOLINK) -o $@ $< $(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) $(OSPTK_LIB)
+ $(CC) $(SOLINK) -o $@ $< $(OSPTK_LIB)
res_osp.o: res_osp.c
$(CC) -c -o $@ $(CFLAGS) $(OSPTK_INCLUDE) $<
%.so : %.o
- $(CC) -o $@ $(SOLINK) $(CYGSOLINK) $< $(CYGSOLIB)
-
-res_features.so: res_features.o
- $(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(CYG_RES_FEATURES_LIB)
-
-res_config_odbc.so: res_config_odbc.o
- $(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(CYG_RES_CONFIG_ODBC_LIB)
+ $(CC) -o $@ $(SOLINK) $<
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)
+ $(CC) $(SOLINK) $(SNMP_LDFLAGS) -o $@ $< snmp/agent.o $(SNMP_LDLIBS)
res_config_pgsql.so: res_config_pgsql.o
- $(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(PGSQL_LIB)
+ $(CC) $(SOLINK) -o $@ $< $(PGSQL_LIB)
res_config_pgsql.o: res_config_pgsql.c
$(CC) -c -o $@ $(CFLAGS) $(PGSQL_INCLUDE) $<
More information about the asterisk-commits
mailing list