build: Move desktop-shell/Makefile.am into toplevel Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 82e21c4..f95c450 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,12 +3,14 @@ xwayland_subdir = xwayland
 endif
 
 bin_PROGRAMS =
+moduledir = $(libdir)/weston
+module_LTLIBRARIES =
+BUILT_SOURCES =
 
 SUBDIRS =                                      \
        shared                                  \
        src                                     \
        $(xwayland_subdir)                      \
-       desktop-shell                           \
        clients                                 \
        protocol                                \
        tests                                   \
@@ -27,7 +29,7 @@ weston.ini : $(srcdir)/weston.ini.in
 
 all-local : weston.ini
 
-CLEANFILES = weston.ini
+CLEANFILES = weston.ini $(BUILT_SOURCES)
 
 
 westondatadir = $(datadir)/weston
@@ -54,3 +56,42 @@ wcap_decode_SOURCES =                                \
 wcap_decode_CFLAGS = $(GCC_CFLAGS) $(WCAP_CFLAGS)
 wcap_decode_LDADD = $(WCAP_LIBS)
 endif
+
+
+if ENABLE_DESKTOP_SHELL
+
+module_LTLIBRARIES += desktop-shell.la
+
+desktop_shell_la_CPPFLAGS =                    \
+       -I$(top_srcdir)/shared                  \
+       -I$(top_srcdir)/src                     \
+       -I$(top_builddir)/src                   \
+       -I$(top_builddir)/desktop-shell         \
+       -DDATADIR='"$(datadir)"'                \
+       -DMODULEDIR='"$(moduledir)"'            \
+       -DLIBEXECDIR='"$(libexecdir)"'          \
+       -DIN_WESTON
+
+desktop_shell_la_LDFLAGS = -module -avoid-version
+desktop_shell_la_LIBADD = $(COMPOSITOR_LIBS)   \
+       shared/libshared.la
+desktop_shell_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS)
+desktop_shell_la_SOURCES =                             \
+       desktop-shell/shell.h                           \
+       desktop-shell/shell.c                           \
+       desktop-shell/exposay.c                         \
+       desktop-shell/input-panel.c                     \
+       desktop-shell/desktop-shell-protocol.c          \
+       desktop-shell/desktop-shell-server-protocol.h   \
+       desktop-shell/xdg-shell-protocol.c              \
+       desktop-shell/xdg-shell-server-protocol.h
+
+BUILT_SOURCES +=                                       \
+       desktop-shell/desktop-shell-protocol.c          \
+       desktop-shell/desktop-shell-server-protocol.h   \
+       desktop-shell/xdg-shell-protocol.c              \
+       desktop-shell/xdg-shell-server-protocol.h
+endif
+
+wayland_protocoldir = $(top_srcdir)/protocol
+include $(top_srcdir)/wayland-scanner.mk

diff --git a/configure.ac b/configure.ac
index 116a30a..f8b1a4f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -488,7 +488,6 @@ AC_CONFIG_FILES([Makefile
                 shared/Makefile
                 src/Makefile
                 xwayland/Makefile
-                desktop-shell/Makefile
                 src/version.h
                 src/weston.pc
                 clients/Makefile

diff --git a/desktop-shell/Makefile.am b/desktop-shell/Makefile.am
deleted file mode 100644 (file)
index fef85f2..0000000
--- a/desktop-shell/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-moduledir = $(libdir)/weston
-module_LTLIBRARIES = $(desktop_shell)
-
-AM_CPPFLAGS =                                  \
-       -I$(top_srcdir)/shared                  \
-       -I$(top_srcdir)/src                     \
-       -I$(top_builddir)/src                   \
-       -DDATADIR='"$(datadir)"'                \
-       -DMODULEDIR='"$(moduledir)"'            \
-       -DLIBEXECDIR='"$(libexecdir)"'          \
-       -DIN_WESTON
-
-if ENABLE_DESKTOP_SHELL
-desktop_shell = desktop-shell.la
-desktop_shell_la_LDFLAGS = -module -avoid-version
-desktop_shell_la_LIBADD = $(COMPOSITOR_LIBS)   \
-       ../shared/libshared.la
-desktop_shell_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS)
-desktop_shell_la_SOURCES =                     \
-       shell.h                                 \
-       shell.c                                 \
-       exposay.c                               \
-       input-panel.c                           \
-       desktop-shell-protocol.c                \
-       desktop-shell-server-protocol.h         \
-       xdg-shell-protocol.c                    \
-       xdg-shell-server-protocol.h
-endif
-
-BUILT_SOURCES =                                        \
-       desktop-shell-protocol.c                \
-       desktop-shell-server-protocol.h         \
-       xdg-shell-protocol.c                    \
-       xdg-shell-server-protocol.h
-
-CLEANFILES = $(BUILT_SOURCES)
-
-wayland_protocoldir = $(top_srcdir)/protocol
-include $(top_srcdir)/wayland-scanner.mk