From f6a5f7def3d31305c142881696c674f6fbc7518d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Tue, 3 Jan 2012 11:02:46 -0500 Subject: [PATCH] Fix distcheck --- Makefile.am | 2 +- clients/Makefile.am | 5 ++++- configure.ac | 3 ++- protocol/Makefile.am | 5 +++++ src/Makefile.am | 1 - 5 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 protocol/Makefile.am diff --git a/Makefile.am b/Makefile.am index 299987b9..e00e475f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1 +1 @@ -SUBDIRS = shared src clients data +SUBDIRS = shared src clients data protocol diff --git a/clients/Makefile.am b/clients/Makefile.am index ea989654..e323de6c 100644 --- a/clients/Makefile.am +++ b/clients/Makefile.am @@ -75,10 +75,13 @@ resizor_LDADD = $(toolkit_libs) wscreensaver_SOURCES = \ wscreensaver.c \ + wscreensaver.h \ desktop-shell-client-protocol.h \ desktop-shell-protocol.c \ wscreensaver-glue.c \ - glmatrix.c + wscreensaver-glue.h \ + glmatrix.c \ + matrix3.xpm wscreensaver_LDADD = $(toolkit_libs) -lGLU eventdemo_SOURCES = eventdemo.c diff --git a/configure.ac b/configure.ac index 41d36f28..6cebf9bc 100644 --- a/configure.ac +++ b/configure.ac @@ -143,5 +143,6 @@ AC_CONFIG_FILES([Makefile shared/Makefile src/Makefile clients/Makefile - data/Makefile]) + data/Makefile + protocol/Makefile]) AC_OUTPUT diff --git a/protocol/Makefile.am b/protocol/Makefile.am new file mode 100644 index 00000000..2f69b07a --- /dev/null +++ b/protocol/Makefile.am @@ -0,0 +1,5 @@ +EXTRA_DIST = \ + desktop-shell.xml \ + screenshooter.xml \ + tablet-shell.xml \ + xserver.xml diff --git a/src/Makefile.am b/src/Makefile.am index 4c7aeb83..bafbbd19 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -93,7 +93,6 @@ tablet_shell_la_LIBADD = $(COMPOSITOR_LIBS) tablet_shell_la_CFLAGS = $(GCC_CFLAGS) tablet_shell_la_SOURCES = \ tablet-shell.c \ - tablet-shell.h \ tablet-shell-protocol.c \ tablet-shell-server-protocol.h endif