[Galago-commits] r2291 - in trunk/libgalago: . libgalago

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2005-11-10 21:31:33 -0800 (Thu, 10 Nov 2005)
New Revision: 2291

Modified:
   trunk/libgalago/ChangeLog
   trunk/libgalago/libgalago/Makefile.am
Log:
Fix a compiler error with a missing galago-marshal.[ch].


Modified: trunk/libgalago/ChangeLog
===================================================================
--- trunk/libgalago/ChangeLog	2005-11-10 21:54:29 UTC (rev 2290)
+++ trunk/libgalago/ChangeLog	2005-11-11 05:31:33 UTC (rev 2291)
@@ -1,3 +1,8 @@
+Thu Nov 10 21:32:16 PST 2005  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago/Makefile.am:
+	  - Fix a compiler error with a missing galago-marshal.[ch].
+
 Mon Nov 07 02:37:16 PST 2005  Christian Hammond <chipx86 at chipx86.com>
 
 	* libgalago/galago-account.c:

Modified: trunk/libgalago/libgalago/Makefile.am
===================================================================
--- trunk/libgalago/libgalago/Makefile.am	2005-11-10 21:54:29 UTC (rev 2290)
+++ trunk/libgalago/libgalago/Makefile.am	2005-11-11 05:31:33 UTC (rev 2291)
@@ -6,10 +6,6 @@
 
 lib_LTLIBRARIES = libgalago.la
 
-$(libgalago_la_OBJECTS): \
-	$(MARSHAL_FILE).h \
-	$(MARSHAL_FILE).c
-
 galago_headers = \
 	galago.h \
 	galago-account.h \
@@ -34,10 +30,16 @@
 	$(ENUM_FILE).h
 
 noinst_HEADERS = \
-	$(MARSHAL_FILE).h
+	galago-marshal.h
 
+BUILT_SOURCES = \
+	$(ENUM_FILE).h \
+	$(ENUM_FILE).c \
+	galago-marshal.c \
+	galago-marshal.h
+
 libgalago_la_SOURCES = \
-	$(MARSHAL_FILE).c \
+	galago-marshal.c \
 	galago-account.c \
 	galago-avatar.c \
 	galago-core.c \
@@ -62,17 +64,13 @@
 libgalago_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
-$(MARSHAL_FILE).h: $(MARSHAL_FILE).list
-	($(GLIB_GENMARSHAL) --prefix=$(MARSHAL_PREFIX) $(MARSHAL_FILE).list \
-		--header > $(MARSHAL_FILE).tmp && \
-	 mv $(MARSHAL_FILE).tmp $(MARSHAL_FILE).h) \
-	|| (rm -f $(MARSHAL_FILE).tmp && exit 1)
+galago-marshal.h: galago-marshal.list
+	$(GLIB_GENMARSHAL) --prefix=$(MARSHAL_PREFIX) galago-marshal.list \
+		--header > galago-marshal.h
 
-$(MARSHAL_FILE).c: $(MARSHAL_FILE).h
-	($(GLIB_GENMARSHAL) --prefix=$(MARSHAL_PREFIX) $(MARSHAL_FILE).list \
-		--body > $(MARSHAL_FILE).tmp && \
-	 mv $(MARSHAL_FILE).tmp $(MARSHAL_FILE).c) \
-	|| (rm -f $(MARSHAL_FILE).tmp && exit 1)
+galago-marshal.c: galago-marshal.list
+	$(GLIB_GENMARSHAL) --prefix=$(MARSHAL_PREFIX) galago-marshal.list \
+		--body > galago-marshal.c
 
 
 $(ENUM_FILE).h: s-enum-types-h
@@ -107,12 +105,12 @@
 	$(PACKAGE_CFLAGS)
 
 EXTRA_DIST = \
-	$(MARSHAL_FILE).list \
+	galago-marshal.list \
 	$(ENUM_FILE).h
 
 CLEANFILES = \
-	$(MARSHAL_FILE).c \
-	$(MARSHAL_FILE).h \
+	galago-marshal.c \
+	galago-marshal.h \
 	$(ENUM_FILE).c \
 	$(ENUM_FILE).h \
 	s-enum-types.c \