summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2012-03-19 12:58:45 +0100
committerMarc-André Lureau <marcandre.lureau@redhat.com>2012-03-20 00:20:45 +0100
commit51d41732933323a0b32176b3f56aa418a7e7b1d0 (patch)
tree18838e515d7a61ac77d9f7d6f6596cfa64b0d64e
parent5b67c33c110df0736279a3b69c2d74efe7fefaee (diff)
build-sys: improve maintainer clean
-rw-r--r--Makefile.am8
-rw-r--r--gtk/Makefile.am78
-rw-r--r--gtk/controller/Makefile.am38
3 files changed, 69 insertions, 55 deletions
diff --git a/Makefile.am b/Makefile.am
index 8ab020a..334752b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,13 @@ MAINTAINERCLEANFILES = \
ABOUT-NLS \
aclocal.m4 \
config.h.in \
- m4/*.m4 \
+ m4/gtk-doc.m4 \
+ m4/intltool.m4 \
+ m4/libtool.m4 \
+ m4/ltoptions.m4 \
+ m4/ltsugar.m4 \
+ m4/ltversion.m4 \
+ m4/lt~obsolete.m4 \
build-aux/compile \
build-aux/config.guess \
build-aux/config.rpath \
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 50ef747..9510d8d 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -2,21 +2,49 @@ NULL =
SUBDIRS = controller
-COMMON_DIR=$(SPICE_COMMON_SRCDIR)
-CLIENT_DIR=$(top_srcdir)/client
+COMMON_DIR = $(SPICE_COMMON_SRCDIR)
-EXTRA_DIST = \
- spice-marshal.txt \
- keymap-gen.pl \
- keymaps.csv \
- decode-glz-tmpl.c \
- map-file \
+# Avoid need for python(pyparsing) by end users
+MARSHALLERS = \
generated_demarshallers.c \
generated_demarshallers1.c \
generated_marshallers.c \
generated_marshallers1.c \
- spice-client-gtk.override \
+ $(NULL)
+
+# Avoid need for perl(Text::CSV) by end users
+KEYMAPS = \
+ vncdisplaykeymap_xorgevdev2xtkbd.c \
+ vncdisplaykeymap_xorgkbd2xtkbd.c \
+ vncdisplaykeymap_xorgxquartz2xtkbd.c \
+ vncdisplaykeymap_xorgxwin2xtkbd.c \
+ vncdisplaykeymap_osx2xtkbd.c \
+ vncdisplaykeymap_win322xtkbd.c \
+ $(NULL)
+
+# End users build dependencies can be cleaned
+GLIBGENS = \
+ spice-glib-enums.c \
+ spice-glib-enums.h \
+ spice-marshal.c \
+ spice-marshal.h \
+ spice-widget-enums.c \
+ spice-widget-enums.h \
+ $(NULL)
+
+CLEANFILES = $(GLIBGENS)
+BUILT_SOURCES = $(GLIBGENS) $(KEYMAPS) $(MARSHALLERS)
+
+EXTRA_DIST = \
+ $(MARSHALLERS) \
+ $(KEYMAPS) \
+ decode-glz-tmpl.c \
+ keymap-gen.pl \
+ keymaps.csv \
+ map-file \
spice-client-gtk-manual.defs \
+ spice-client-gtk.override \
+ spice-marshal.txt \
$(NULL)
bin_PROGRAMS = spicy snappy spicy-stats
@@ -25,15 +53,12 @@ acldir = $(ACL_HELPER_DIR)
acl_PROGRAMS = spice-client-glib-usb-acl-helper
endif
-lib_LTLIBRARIES = \
- libspice-client-glib-2.0.la
+lib_LTLIBRARIES = libspice-client-glib-2.0.la
if HAVE_GTK_2
-lib_LTLIBRARIES += \
- libspice-client-gtk-2.0.la
+lib_LTLIBRARIES += libspice-client-gtk-2.0.la
else
-lib_LTLIBRARIES += \
- libspice-client-gtk-3.0.la
+lib_LTLIBRARIES += libspice-client-gtk-3.0.la
endif
if HAVE_LD_VERSION_SCRIPT
@@ -44,17 +69,6 @@ endif
KEYMAP_GEN = $(srcdir)/keymap-gen.pl
-KEYMAPS = \
- vncdisplaykeymap_xorgevdev2xtkbd.c \
- vncdisplaykeymap_xorgkbd2xtkbd.c \
- vncdisplaykeymap_xorgxquartz2xtkbd.c \
- vncdisplaykeymap_xorgxwin2xtkbd.c \
- vncdisplaykeymap_osx2xtkbd.c \
- vncdisplaykeymap_win322xtkbd.c
-
-# Avoid need for perl(Text::CSV) by end users
-EXTRA_DIST += $(KEYMAPS)
-
SPICE_COMMON_CPPFLAGS = \
-DG_LOG_DOMAIN=\"GSpice\" \
-DSPICE_NO_DEPRECATED \
@@ -263,10 +277,7 @@ libspice_client_glib_2_0_la_SOURCES = \
$(NULL)
nodist_libspice_client_glib_2_0_la_SOURCES = \
- generated_demarshallers.c \
- generated_demarshallers1.c \
- generated_marshallers.c \
- generated_marshallers1.c \
+ $(MARSHALLERS) \
spice-glib-enums.c \
spice-marshal.c \
spice-marshal.h \
@@ -538,13 +549,6 @@ vncdisplaykeymap_osx2xtkbd.c:
vncdisplaykeymap_win322xtkbd.c:
$(AM_V_GEN)$(KEYMAP_GEN) $(srcdir)/keymaps.csv win32 xtkbd > $@ || rm $@
-CLEANFILES = spice-marshal.c spice-marshal.h \
- spice-glib-enums.c spice-glib-enums.h \
- spice-widget-enums.c spice-widget-enums.h
-MAINTAINERCLEANFILES = $(KEYMAPS)
-
-BUILT_SOURCES = $(CLEANFILES) $(MAINTAINERCLEANFILES)
-
if WITH_PYTHON
pyexec_LTLIBRARIES = SpiceClientGtk.la
diff --git a/gtk/controller/Makefile.am b/gtk/controller/Makefile.am
index 916309e..639a1e0 100644
--- a/gtk/controller/Makefile.am
+++ b/gtk/controller/Makefile.am
@@ -22,20 +22,29 @@ AM_VALAFLAGS = \
lib_LTLIBRARIES = libspice-controller.la
noinst_PROGRAMS = test-controller spice-controller-dump
-BUILT_SOURCES = controller.vala.stamp
-
libspice_controller_la_VALASOURCES = \
menu.vala \
controller.vala \
foreign-menu.vala \
$(NULL)
-libspice_controller_la_SOURCES = \
- custom.h \
- spice-controller-listener.c \
- spice-controller-listener.h \
- spice-foreign-menu-listener.c \
- spice-foreign-menu-listener.h \
- $(libspice_controller_la_VALASOURCES:.vala=.c) \
+
+libspice_controller_la_BUILT_SOURCES = \
+ $(libspice_controller_la_VALASOURCES:.vala=.c) \
+ spice-controller.h \
+ $(NULL)
+
+BUILT_SOURCES = \
+ $(libspice_controller_la_BUILT_SOURCES) \
+ controller.vala.stamp \
+ $(NULL)
+
+libspice_controller_la_SOURCES = \
+ $(libspice_controller_la_BUILT_SOURCES) \
+ custom.h \
+ spice-controller-listener.c \
+ spice-controller-listener.h \
+ spice-foreign-menu-listener.c \
+ spice-foreign-menu-listener.h \
$(NULL)
if OS_WIN32
@@ -50,7 +59,7 @@ libspice_controller_la_SOURCES += \
endif
libspice_controller_la_LDFLAGS = \
$(AM_LDFLAGS) \
- -version-number 0:0:0 \
+ -version-info 0:0:0 \
$(NULL)
libspice_controllerincludedir = $(includedir)/spice-controller
@@ -74,18 +83,13 @@ controller.vala.stamp: $(libspice_controller_la_VALASOURCES) custom.vapi
$(VALA_V)$(VALAC) $(VALAFLAGS) $(AM_VALAFLAGS) $(libspice_controller_la_VALASOURCES) -H spice-controller.h
@touch $@
-spice-controller.h: controller.vala.stamp
-menu.c: controller.vala.stamp
-controller.c: controller.vala.stamp
+$(libspice_controller_la_BUILT_SOURCES): controller.vala.stamp
EXTRA_DIST = \
$(libspice_controller_la_VALASOURCES) \
controller.vala.stamp \
custom.vapi \
gio-windows-2.0.vapi \
- spice-controller.h \
$(NULL)
-vala-clean:
- rm -f `find . -name "*.stamp"`
-
+-include $(top_srcdir)/git.mk