summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Schlaile2008-09-27 22:04:14 +0200
committerroot2008-09-27 22:04:14 +0200
commit01c11f2ecf3a2cb4ce273af75ef89e033650b5ef (patch)
tree1c2af968f84e2e74e1b556bbb2967f48f045f020
parentchan_lcr: fixed race condition in new ref assignment (diff)
parentupdated autoconf (diff)
downloadlcr-01c11f2ecf3a2cb4ce273af75ef89e033650b5ef.tar.gz
lcr-01c11f2ecf3a2cb4ce273af75ef89e033650b5ef.tar.xz
lcr-01c11f2ecf3a2cb4ce273af75ef89e033650b5ef.zip
Merge branch 'master' of ssh://schlaile@git.misdn.org/var/git/lcr
-rw-r--r--Makefile.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index ab5d635..5489191 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -70,7 +70,8 @@ PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
am_chan_lcr_so_OBJECTS =
chan_lcr_so_OBJECTS = $(am_chan_lcr_so_OBJECTS)
@ENABLE_ASTERISK_CHANNEL_DRIVER_TRUE@chan_lcr_so_DEPENDENCIES = \
-@ENABLE_ASTERISK_CHANNEL_DRIVER_TRUE@ chan_lcr.o bchannel.o
+@ENABLE_ASTERISK_CHANNEL_DRIVER_TRUE@ chan_lcr.o bchannel.o \
+@ENABLE_ASTERISK_CHANNEL_DRIVER_TRUE@ options.o
am_genextension_OBJECTS = genext.$(OBJEXT) options.$(OBJEXT) \
extension.$(OBJEXT)
genextension_OBJECTS = $(am_genextension_OBJECTS)
@@ -224,7 +225,7 @@ INSTALLATION_DEFINES = \
INCLUDES = $(all_includes) -I/usr/include/mISDNuser $(INSTALLATION_DEFINES)
@ENABLE_ASTERISK_CHANNEL_DRIVER_TRUE@chan_lcr_so_SOURCES =
@ENABLE_ASTERISK_CHANNEL_DRIVER_TRUE@chan_lcr_so_LDFLAGS = -shared
-@ENABLE_ASTERISK_CHANNEL_DRIVER_TRUE@chan_lcr_so_LDADD = chan_lcr.o bchannel.o
+@ENABLE_ASTERISK_CHANNEL_DRIVER_TRUE@chan_lcr_so_LDADD = chan_lcr.o bchannel.o options.o
lcr_SOURCES = action.cpp mISDN.cpp tones.c \
action_efi.cpp crypt.cpp mail.c trace.c \
action_vbox.cpp dss1.cpp main.c \