diff options
-rw-r--r-- | polyp/Makefile.am | 6 | ||||
-rw-r--r-- | polyp/client-conf.c | 2 | ||||
-rw-r--r-- | polyp/conf-parser.c (renamed from polyp/confparser.c) | 2 | ||||
-rw-r--r-- | polyp/conf-parser.h (renamed from polyp/confparser.h) | 0 | ||||
-rw-r--r-- | polyp/daemon-conf.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/polyp/Makefile.am b/polyp/Makefile.am index 9dde211d..7efb46c7 100644 --- a/polyp/Makefile.am +++ b/polyp/Makefile.am @@ -159,7 +159,7 @@ polypaudio_SOURCES = idxset.c idxset.h \ modinfo.c modinfo.h \ daemon-conf.c daemon-conf.h \ dumpmodules.c dumpmodules.h \ - conparser.h confparser.c + conf-parser.h conf-parser.c polypaudio_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS) polypaudio_INCLUDES = $(INCLTDL) @@ -334,8 +334,8 @@ libpolyp_@PA_MAJORMINOR@_la_SOURCES = polyplib.h \ llist.h \ log.c log.h \ gcc-printf.h \ - client-conf.c client-conf.h \ - confparser.c confparser.h + client-conf.c client-conf.h \ + conf-parser.c conf-parser.h libpolyp_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) libpolyp_@PA_MAJORMINOR@_la_LDFLAGS = -version-info 0:0:0 diff --git a/polyp/client-conf.c b/polyp/client-conf.c index cfc257c6..d904cb49 100644 --- a/polyp/client-conf.c +++ b/polyp/client-conf.c @@ -26,7 +26,7 @@ #include "client-conf.h" #include "xmalloc.h" #include "log.h" -#include "confparser.h" +#include "conf-parser.h" #include "util.h" #ifndef DEFAULT_CLIENT_CONFIG_FILE diff --git a/polyp/confparser.c b/polyp/conf-parser.c index 8f551b95..20e8e723 100644 --- a/polyp/confparser.c +++ b/polyp/conf-parser.c @@ -24,7 +24,7 @@ #include <stdio.h> #include <errno.h> -#include "confparser.h" +#include "conf-parser.h" #include "log.h" #include "util.h" #include "xmalloc.h" diff --git a/polyp/confparser.h b/polyp/conf-parser.h index a0eb52d0..a0eb52d0 100644 --- a/polyp/confparser.h +++ b/polyp/conf-parser.h diff --git a/polyp/daemon-conf.c b/polyp/daemon-conf.c index 72ded989..a3185364 100644 --- a/polyp/daemon-conf.c +++ b/polyp/daemon-conf.c @@ -34,7 +34,7 @@ #include "util.h" #include "xmalloc.h" #include "strbuf.h" -#include "confparser.h" +#include "conf-parser.h" #ifndef DEFAULT_SCRIPT_FILE #define DEFAULT_SCRIPT_FILE "/etc/polypaudio/default.pa" |