Skip to content
Snippets Groups Projects
Commit ee3d65e9 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Remove zeroconf from the build system

parent 5cf03fa3
No related branches found
No related tags found
No related merge requests found
...@@ -36,8 +36,7 @@ AC_CONFIG_FILES([src/Makefile \ ...@@ -36,8 +36,7 @@ AC_CONFIG_FILES([src/Makefile \
src/audio/codecs/Makefile src/audio/codecs/Makefile
src/audio/codecs/ilbc/Makefile \ src/audio/codecs/ilbc/Makefile \
src/config/Makefile \ src/config/Makefile \
src/dbus/Makefile \ src/dbus/Makefile ])
src/zeroconf/Makefile])
dnl Unitary test section dnl Unitary test section
AC_CONFIG_FILES([test/Makefile]) AC_CONFIG_FILES([test/Makefile])
......
...@@ -2,16 +2,6 @@ include ../globals.mak ...@@ -2,16 +2,6 @@ include ../globals.mak
bin_PROGRAMS = sflphoned bin_PROGRAMS = sflphoned
if USE_ZEROCONF
ZEROCONFDIR = zeroconf
ZEROCONFLIB = zeroconf/libzeroconf.la
ZEROCONFFLAGS = -DUSE_ZEROCONF
else
ZEROCONFDIR =
ZEROCONFLIB =
ZEROCONFFLAGS =
endif
if USE_IAX if USE_IAX
# Use the global instead of locally built # Use the global instead of locally built
IAX_FLAGS = -DUSE_IAX IAX_FLAGS = -DUSE_IAX
...@@ -23,7 +13,7 @@ IAXSOURCES = ...@@ -23,7 +13,7 @@ IAXSOURCES =
IAXHEADERS = IAXHEADERS =
endif endif
SUBDIRS = audio config dbus $(ZEROCONFDIR) SUBDIRS = audio config dbus
# Add here the cpp files to be build with sflphone # Add here the cpp files to be build with sflphone
sflphoned_SOURCES = \ sflphoned_SOURCES = \
...@@ -43,7 +33,6 @@ sflphoned_SOURCES = \ ...@@ -43,7 +33,6 @@ sflphoned_SOURCES = \
sflphoned_CXXFLAGS = \ sflphoned_CXXFLAGS = \
-DPREFIX=\"$(prefix)\" -DPROGSHAREDIR=\"${datadir}/sflphone\" \ -DPREFIX=\"$(prefix)\" -DPROGSHAREDIR=\"${datadir}/sflphone\" \
$(ZEROCONFFLAGS) \
$(IAX_FLAGS) $(IAX_FLAGS)
...@@ -52,7 +41,6 @@ sflphoned_LDADD = \ ...@@ -52,7 +41,6 @@ sflphoned_LDADD = \
./libsflphone.la \ ./libsflphone.la \
@CCGNU2_LIBS@ \ @CCGNU2_LIBS@ \
@CCEXT2_LIBS@ \ @CCEXT2_LIBS@ \
$(ZEROCONFLIB) \
$(IAX_LIBS) \ $(IAX_LIBS) \
$(PJSIP_LIBS) \ $(PJSIP_LIBS) \
@DBUSCPP_LIBS@ \ @DBUSCPP_LIBS@ \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment