diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2013-11-20 12:39:03 +0100 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2013-11-20 12:39:03 +0100 |
| commit | cc5820e9df049526db1e0ac5da87bbc2c28c9cfc (patch) | |
| tree | 64cf10414e8aec6f1d9360ab2a79641196058305 | |
| parent | 705460b3e669bf4f0bd02bdef8915a28cc08f4fc (diff) | |
| download | graynard-cc5820e9df049526db1e0ac5da87bbc2c28c9cfc.tar.gz graynard-cc5820e9df049526db1e0ac5da87bbc2c28c9cfc.zip | |
Rename the shell to weston-gtk-shell
To avoid conflicts with weston's weston-desktop-shell.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | shell/Makefile.am | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -38,4 +38,4 @@ _gen /weston-gtk-shell-*.tar.xz shell/desktop-shell-client-protocol.h shell/desktop-shell-protocol.c -shell/weston-desktop-shell +shell/weston-gtk-shell diff --git a/shell/Makefile.am b/shell/Makefile.am index 09bdad8..3bd6215 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -1,4 +1,4 @@ -libexec_PROGRAMS = weston-desktop-shell +libexec_PROGRAMS = weston-gtk-shell AM_CFLAGS = $(GCC_CFLAGS) AM_CPPFLAGS = $(CLIENT_CFLAGS) $(GTK_CFLAGS) @@ -9,7 +9,7 @@ external_sources = \ egg-flow-box.c \ egg-flow-box.h -weston_desktop_shell_SOURCES = \ +weston_gtk_shell_SOURCES = \ gtk-shell.c \ app-launcher.c \ app-launcher.h \ @@ -20,7 +20,7 @@ weston_desktop_shell_SOURCES = \ desktop-shell-client-protocol.h \ desktop-shell-protocol.c \ $(external_sources) -weston_desktop_shell_LDADD = $(GTK_LIBS) +weston_gtk_shell_LDADD = $(GTK_LIBS) BUILT_SOURCES = \ desktop-shell-client-protocol.h \ |