[gnome-control-center] display: Generate marshal files properly
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] display: Generate marshal files properly
- Date: Fri, 10 Sep 2010 15:23:19 +0000 (UTC)
commit eb1e75ec6e6e40a5ab0d98eb42babdda0117368f
Author: Bastien Nocera <hadess hadess net>
Date: Fri Sep 10 11:56:09 2010 +0100
display: Generate marshal files properly
Instead of having generated files in the repo.
panels/display/Makefile.am | 15 ++-
panels/display/foo-marshal.c | 279 ---------------------------------------
panels/display/foo-marshal.h | 63 ---------
panels/display/foo-marshal.list | 6 +
4 files changed, 17 insertions(+), 346 deletions(-)
---
diff --git a/panels/display/Makefile.am b/panels/display/Makefile.am
index 895282d..a4665d5 100644
--- a/panels/display/Makefile.am
+++ b/panels/display/Makefile.am
@@ -4,19 +4,26 @@ cappletname = display
uidir = $(pkgdatadir)/ui
dist_ui_DATA = display-capplet.ui
+MARSHALFILES = foo-marshal.c foo-marshal.h
+BUILT_SOURCES = $(MARSHALFILES)
+
+foo-marshal.c: foo-marshal.h
+ $(AM_V_GEN) ( $(GLIB_GENMARSHAL) --prefix=foo_marshal $(srcdir)/foo-marshal.list --header --body > foo-marshal.c )
+foo-marshal.h: foo-marshal.list
+ $(AM_V_GEN) ( $(GLIB_GENMARSHAL) --prefix=foo_marshal $(srcdir)/foo-marshal.list --header > foo-marshal.h )
+
ccpanelsdir = $(PANELS_DIR)
ccpanels_LTLIBRARIES = libdisplay.la
-libdisplay_la_SOURCES = \
+libdisplay_la_SOURCES = \
display-module.c \
cc-display-panel.c \
cc-display-panel.h \
xrandr-capplet.c \
xrandr-capplet.h \
scrollarea.c \
- foo-marshal.c \
scrollarea.h \
- foo-marshal.h
+ $(MARSHALFILES)
libdisplay_la_LIBADD = $(DBUS_LIBS) $(PANEL_LIBS)
libdisplay_la_LDFLAGS = $(PANEL_LDFLAGS) $(DISPLAY_CAPPLET_LIBS)
@@ -76,7 +83,7 @@ update-icon-cache:
echo "*** $(gtk_update_icon_cache)"; \
fi
-EXTRA_DIST = org.gnome.randr.policy.in
+EXTRA_DIST = org.gnome.randr.policy.in foo-marshal.list
DISTCLEANFILES = org.gnome.randr.policy
-include $(top_srcdir)/git.mk
diff --git a/panels/display/foo-marshal.list b/panels/display/foo-marshal.list
new file mode 100644
index 0000000..dea3cd6
--- /dev/null
+++ b/panels/display/foo-marshal.list
@@ -0,0 +1,6 @@
+VOID:OBJECT,OBJECT
+VOID:UINT,UINT,UINT,UINT
+VOID:UINT,UINT
+VOID:BOXED,BOXED
+VOID:POINTER,BOXED,POINTER
+VOID:POINTER,POINTER
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]