summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2011-03-30 19:14:53 +0200
committerMarc-André Lureau <marcandre.lureau@redhat.com>2011-03-30 19:14:53 +0200
commit9add4076d2ec4f4bf33c19ac1a18347dd3bc1d9f (patch)
tree81b69658f0d5d7ac683593a442aa6d58739c1c9b /gtk
parent3271ebe9bc40dc3e018639effaf8c1a82f018398 (diff)
build: fix make dist
Diffstat (limited to 'gtk')
-rw-r--r--gtk/Makefile.am5
-rw-r--r--gtk/controller/Makefile.am41
2 files changed, 32 insertions, 14 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 3fd206f..ade13c3 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -262,16 +262,15 @@ displaysrc = \
display/gnome-rr-config.c \
display/gnome-rr-config.h \
display/gnome-rr-output-info.c \
- display/gnome-rr-output-info.h \
display/gnome-rr-private.h \
display/gnome-rr.c \
display/gnome-rr.h \
$(NULL)
if WITH_DISPLAY_X11
-displaysrc += display/gnome-rr-x11.c
+displaysrc += display/gnome-rr-x11.c display/gnome-rr-x11.h
else
-displaysrc += display/gnome-rr-windows.c
+displaysrc += display/gnome-rr-windows.c display/gnome-rr-windows.h
endif
spicy_SOURCES = \
diff --git a/gtk/controller/Makefile.am b/gtk/controller/Makefile.am
index 6859b5b..5c73f72 100644
--- a/gtk/controller/Makefile.am
+++ b/gtk/controller/Makefile.am
@@ -2,14 +2,7 @@ NULL =
AM_CPPFLAGS = $(GIO_CFLAGS) $(PROTOCOL_CFLAGS)
AM_LDFLAGS = $(GIO_LIBS)
-noinst_LIBRARIES = libcontroller.a
-noinst_PROGRAMS = test-controller
-
-libcontroller_a_SOURCES = \
- menu.vala \
- controller.vala \
- $(NULL)
-libcontroller_a_VALAFLAGS = \
+AM_VALAFLAGS = \
--pkg gio-2.0 \
--pkg spice-protocol --vapidir=$(top_srcdir)/data \
--pkg custom --vapidir=$(srcdir) \
@@ -17,13 +10,39 @@ libcontroller_a_VALAFLAGS = \
$(NULL)
if OS_WIN32
-libcontroller_a_VALAFLAGS += --pkg gio-windows-2.0
+AM_VALAFLAGS += --pkg gio-windows-2.0
else
-libcontroller_a_VALAFLAGS += --pkg gio-unix-2.0
+AM_VALAFLAGS += --pkg gio-unix-2.0
+endif
+
+if !OS_WIN32
+noinst_LTLIBRARIES = libcontroller.la
+noinst_PROGRAMS = test-controller
endif
+BUILT_SOURCES = controller.vala.stamp
+
+libcontroller_la_VALASOURCES = \
+ menu.vala \
+ controller.vala \
+ $(NULL)
+libcontroller_la_SOURCES = \
+ custom.h \
+ $(libcontroller_la_VALASOURCES:.vala=.c)
+
test_controller_SOURCES = test.c
-test_controller_LDADD = libcontroller.a
+test_controller_LDADD = libcontroller.la
+
+controller.vala.stamp: $(libcontroller_la_VALASOURCES) custom.vapi
+ $(VALA_V)$(VALAC) $(VALAFLAGS) $(AM_VALAFLAGS) $^
+ @touch $@
+
+EXTRA_DIST = \
+ $(libcontroller_la_VALASOURCES) \
+ controller.h \
+ controller.vala.stamp \
+ custom.vapi \
+ $(NULL)
vala-clean:
rm -f `find . -name "*.stamp"`