From 9b935c823904ea9ef7366e928b9276a9b84ffa18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Thu, 8 Dec 2011 12:44:27 -0500 Subject: [PATCH] Use '-' to separate words in file names Eventually we will want more functionality in the shared library and we will rename it at that point. Perhaps we'll name it libnih, but for now let's stick with libconfig-parser. --- clients/Makefile.am | 4 ++-- clients/desktop-shell.c | 2 +- clients/tablet-shell.c | 2 +- shared/Makefile.am | 7 ++++--- shared/{configparser.c => config-parser.c} | 2 +- shared/{configparser.h => config-parser.h} | 0 6 files changed, 9 insertions(+), 8 deletions(-) rename shared/{configparser.c => config-parser.c} (99%) rename shared/{configparser.h => config-parser.h} (100%) diff --git a/clients/Makefile.am b/clients/Makefile.am index 0494c3bd..1fe6ff54 100644 --- a/clients/Makefile.am +++ b/clients/Makefile.am @@ -81,14 +81,14 @@ wayland_desktop_shell_SOURCES = \ desktop-shell-client-protocol.h \ desktop-shell-protocol.c wayland_desktop_shell_LDADD = $(toolkit_libs) \ - ../shared/libconfigparser.la + ../shared/libconfig-parser.la wayland_tablet_shell_SOURCES = \ tablet-shell.c \ tablet-shell-client-protocol.h \ tablet-shell-protocol.c wayland_tablet_shell_LDADD = $(toolkit_libs) \ - ../shared/libconfigparser.la + ../shared/libconfig-parser.la BUILT_SOURCES = \ screenshooter-client-protocol.h \ diff --git a/clients/desktop-shell.c b/clients/desktop-shell.c index acd39e86..87053f65 100644 --- a/clients/desktop-shell.c +++ b/clients/desktop-shell.c @@ -35,7 +35,7 @@ #include #include "cairo-util.h" #include "window.h" -#include "../shared/configparser.h" +#include "../shared/config-parser.h" #include "desktop-shell-client-protocol.h" diff --git a/clients/tablet-shell.c b/clients/tablet-shell.c index d6e07897..c6912ba5 100644 --- a/clients/tablet-shell.c +++ b/clients/tablet-shell.c @@ -27,7 +27,7 @@ #include "window.h" #include "cairo-util.h" -#include "../shared/configparser.h" +#include "../shared/config-parser.h" #include "tablet-shell-client-protocol.h" diff --git a/shared/Makefile.am b/shared/Makefile.am index a964a04f..79568b65 100644 --- a/shared/Makefile.am +++ b/shared/Makefile.am @@ -1,3 +1,4 @@ -noinst_LTLIBRARIES = libconfigparser.la -libconfigparser_la_SOURCES = configparser.c \ - configparser.h +noinst_LTLIBRARIES = libconfig-parser.la +libconfig_parser_la_SOURCES = \ + config-parser.c \ + config-parser.h diff --git a/shared/configparser.c b/shared/config-parser.c similarity index 99% rename from shared/configparser.c rename to shared/config-parser.c index 3deb89dd..3b8c5c20 100644 --- a/shared/configparser.c +++ b/shared/config-parser.c @@ -25,7 +25,7 @@ #include #include -#include "configparser.h" +#include "config-parser.h" static int handle_key(const struct config_key *key, const char *value) diff --git a/shared/configparser.h b/shared/config-parser.h similarity index 100% rename from shared/configparser.h rename to shared/config-parser.h