mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

* add some missing "static"s

Browse source 
* include libltdl in distribution


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@302 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2004-11-21 17:02:25 +00:00
parent 966c78ccae
commit b03f39099f
6 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -18,7 +18,7 @@
# USA. # USA.
EXTRA_DIST = bootstrap.sh README LICENSE doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in 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 MAINTAINERCLEANFILES=README
noinst_DATA = README noinst_DATA = README

2
bootstrap.sh
View file

@ -36,7 +36,7 @@ else
rm -f config.cache rm -f config.cache
run_versioned aclocal 1.7 run_versioned aclocal 1.7
libtoolize -c --force libtoolize -c --force --ltdl
autoheader autoheader
run_versioned automake 1.7 -a -c --foreign run_versioned automake 1.7 -a -c --foreign
autoconf -Wall autoconf -Wall

5
configure.ac
View file

@ -37,11 +37,14 @@ fi
# Checks for programs. # Checks for programs.
AC_PROG_CC AC_PROG_CC
# libtool stuff
AC_LIBLTDL_INSTALLABLE AC_LIBLTDL_INSTALLABLE
AC_SUBST(INCLTDL) AC_SUBST(LTDLINCL)
AC_SUBST(LIBLTDL) AC_SUBST(LIBLTDL)
AC_LIBTOOL_DLOPEN AC_LIBTOOL_DLOPEN
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
AC_CONFIG_SUBDIRS(libltdl)
# Checks for header files. # Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC

4
polyp/Makefile.am
View file

@ -215,9 +215,9 @@ polypaudio_SOURCES = idxset.c idxset.h \
pid.c pid.h pid.c pid.h
polypaudio_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS) 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_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_SOURCES = protocol-simple.c protocol-simple.h
libprotocol_simple_la_LDFLAGS = -avoid-version libprotocol_simple_la_LDFLAGS = -avoid-version

4
polyp/daemon-conf.c
View file

@ -119,7 +119,7 @@ int pa_daemon_conf_set_resample_method(struct pa_daemon_conf *c, const char *str
return 0; 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; struct pa_daemon_conf *c = data;
assert(filename && lvalue && rvalue && 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; 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; struct pa_daemon_conf *c = data;
assert(filename && lvalue && rvalue && data); assert(filename && lvalue && rvalue && data);

2
polyp/mainloop.c
View file

@ -130,7 +130,7 @@ static void mainloop_io_set_destroy(struct pa_io_event *e, void (*callback)(stru
} }
/* Defer events */ /* 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_mainloop *m;
struct pa_defer_event *e; struct pa_defer_event *e;