[vino] Generate enums and marshalers before they are used

[David King <davidk src gnome org>]

commit 8e5b83c39585b926578075915c9cc70ca627a6b3
Author: David King <amigadave amigadave com>
Date:   Sun Mar 20 09:37:44 2011 +0100

    Generate enums and marshalers before they are used
    
    Make vinagre/vinagre-enums.c depend on vinagre/vinagre-enums.h. Reorder
    sources so that the marshallers and enums sources are generated before
    they are needed, fixing bug 645266.

 Makefile.am |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index f4266ec..fda5f4d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -134,6 +134,8 @@ dist_clientfile_DATA = server/Vino.client
 endif
 
 vino_server_SOURCES = \
+	$(marshal_data) \
+	$(enum_data) \
 	common/vino-dbus.c \
 	common/vino-dbus.h \
 	server/vino-cursor.c \
@@ -165,11 +167,9 @@ vino_server_SOURCES = \
 	$(VINO_IFADDR_sources) \
 	$(VINO_LIBVNCSERVER_sources) \
 	$(VINO_HTTP_sources) \
-	$(VINO_TELEPATHY_GLIB_sources) \
-	$(nodist_marshal_data) \
-	$(nodist_enum_data)
+	$(VINO_TELEPATHY_GLIB_sources)
 
-nodist_marshal_data = \
+marshal_data = \
 	server/vino-marshal.c \
 	server/vino-marshal.h
 
@@ -179,7 +179,7 @@ server/vino-marshal.h: server/vino-marshal.list
 server/vino-marshal.c: server/vino-marshal.list server/vino-marshal.h
 	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --body --prefix=vino_marshal $< > $@
 
-nodist_enum_data = \
+enum_data = \
 	server/vino-enums.c \
 	server/vino-enums.h
 
@@ -189,7 +189,7 @@ vino_enum_headers = \
 	server/vino-status-icon.h \
 	server/vino-status-tube-icon.h
 
-server/vino-enums.c: $(vino_enum_headers)
+server/vino-enums.c: $(vino_enum_headers) server/vino-enums.h
 	$(AM_V_GEN)$(GLIB_MKENUMS) \
 		--fhead "#include \"vino-enums.h\"\n\n" \
 		--fprod "/* enumerations from \"@filename \" */\n" \
@@ -348,8 +348,8 @@ CLEANFILES = \
 	$(nodist_desktop_DATA) \
 	$(gsettings_SCHEMAS) \
 	$(nodist_service_DATA) \
-	$(nodist_marshal_data) \
-	$(nodist_enum_data) \
+	$(marshal_data) \
+	$(enum_data) \
 	server/vino-server.desktop \
 	server/vino-server.desktop.in