* add some missing "static"s

* include libltdl in distribution

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@302 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/Makefile.am b/Makefile.am
index 04c8f2c..9b419d1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@
 # USA.
 
 EXTRA_DIST = bootstrap.sh README LICENSE doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in
-SUBDIRS=polyp doc
+SUBDIRS=polyp doc libltdl
 
 MAINTAINERCLEANFILES=README
 noinst_DATA = README

diff --git a/bootstrap.sh b/bootstrap.sh
index 7dc081a..4b9032b 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -36,7 +36,7 @@ else
     rm -f config.cache
 
     run_versioned aclocal 1.7
-    libtoolize -c --force
+    libtoolize -c --force --ltdl
     autoheader
     run_versioned automake 1.7 -a -c --foreign
     autoconf -Wall

diff --git a/configure.ac b/configure.ac
index 4553341..0a1ebd0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -37,11 +37,14 @@ fi
 
 # Checks for programs.
 AC_PROG_CC
+
+# libtool stuff
 AC_LIBLTDL_INSTALLABLE
-AC_SUBST(INCLTDL)
+AC_SUBST(LTDLINCL)
 AC_SUBST(LIBLTDL)
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
+AC_CONFIG_SUBDIRS(libltdl)
 
 # Checks for header files.
 AC_HEADER_STDC

diff --git a/polyp/Makefile.am b/polyp/Makefile.am
index 13ef893..6d9962d 100644 (file)
--- a/polyp/Makefile.am
+++ b/polyp/Makefile.am
@@ -215,9 +215,9 @@ polypaudio_SOURCES = idxset.c idxset.h \
                pid.c pid.h
 
 polypaudio_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS)
-polypaudio_INCLUDES = $(INCLTDL)
+polypaudio_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
 polypaudio_LDADD = $(AM_LDADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS)
-polypaudio_LDFLAGS= -export-dynamic -dlopen force #-static $(foreach f,$(modlib_LTLIBRARIES),-dlpreopen $(f))
+polypaudio_LDFLAGS= $(AM_LDFLAGS) -export-dynamic -dlopen force #-static $(foreach f,$(modlib_LTLIBRARIES),-dlpreopen $(f))
 
 libprotocol_simple_la_SOURCES = protocol-simple.c protocol-simple.h
 libprotocol_simple_la_LDFLAGS = -avoid-version

diff --git a/polyp/daemon-conf.c b/polyp/daemon-conf.c
index 9728019..7753da6 100644 (file)
--- a/polyp/daemon-conf.c
+++ b/polyp/daemon-conf.c
@@ -119,7 +119,7 @@ int pa_daemon_conf_set_resample_method(struct pa_daemon_conf *c, const char *str
     return 0;
 }
 
-int parse_log_target(const char *filename, unsigned line, const char *lvalue, const char *rvalue, void *data, void *userdata) {
+static int parse_log_target(const char *filename, unsigned line, const char *lvalue, const char *rvalue, void *data, void *userdata) {
     struct pa_daemon_conf *c = data;
     assert(filename && lvalue && rvalue && data);
 
@@ -131,7 +131,7 @@ int parse_log_target(const char *filename, unsigned line, const char *lvalue, co
     return 0;
 }
 
-int parse_resample_method(const char *filename, unsigned line, const char *lvalue, const char *rvalue, void *data, void *userdata) {
+static int parse_resample_method(const char *filename, unsigned line, const char *lvalue, const char *rvalue, void *data, void *userdata) {
     struct pa_daemon_conf *c = data;
     assert(filename && lvalue && rvalue && data);
 

diff --git a/polyp/mainloop.c b/polyp/mainloop.c
index d530419..f6bb414 100644 (file)
--- a/polyp/mainloop.c
+++ b/polyp/mainloop.c
@@ -130,7 +130,7 @@ static void mainloop_io_set_destroy(struct pa_io_event *e, void (*callback)(stru
 }
 
 /* Defer events */
-struct pa_defer_event* mainloop_defer_new(struct pa_mainloop_api*a, void (*callback) (struct pa_mainloop_api*a, struct pa_defer_event *e, void *userdata), void *userdata) {
+static struct pa_defer_event* mainloop_defer_new(struct pa_mainloop_api*a, void (*callback) (struct pa_mainloop_api*a, struct pa_defer_event *e, void *userdata), void *userdata) {
     struct pa_mainloop *m;
     struct pa_defer_event *e;