[f-spot] fix GKeyFile's Makefile.am

[Ruben Vermeersch <rubenv src gnome org>]

commit 11684a5f78585de8a5415d29cc4995a488810311
Author: Christian Krause <chkr plauener de>
Date:   Sat Jun 19 21:08:23 2010 +0200

    fix GKeyFile's Makefile.am
    
    - does not generate automake warnings anymore
    - adjust Makefile.am to the coding style of the other Makefile.am
    - remove auto-generated files

 lib/GKeyFile/.gitignore            |    1 +
 lib/GKeyFile/Makefile.am           |   55 ++--
 lib/GKeyFile/generated/Error.cs    |   20 -
 lib/GKeyFile/generated/Flags.cs    |   18 -
 lib/GKeyFile/generated/GKeyFile.cs |  685 ------------------------------------
 5 files changed, 24 insertions(+), 755 deletions(-)
---
diff --git a/lib/GKeyFile/.gitignore b/lib/GKeyFile/.gitignore
index 56674d8..cb6101e 100644
--- a/lib/GKeyFile/.gitignore
+++ b/lib/GKeyFile/.gitignore
@@ -1,3 +1,4 @@
 /Makefile
 /Makefile.in
 /gkeyfile-sharp.dll*
+/generated/
diff --git a/lib/GKeyFile/Makefile.am b/lib/GKeyFile/Makefile.am
index 958b432..690cebe 100644
--- a/lib/GKeyFile/Makefile.am
+++ b/lib/GKeyFile/Makefile.am
@@ -1,53 +1,44 @@
 include $(top_srcdir)/Makefile.include
 
-ASSEMBLY_NAME = gkeyfile-sharp
-
-ASSEMBLY_SOURCES =
-
-ASSEMBLY_CUSTOMS =			\
+CUSTOMS =			\
 	$(srcdir)/GKeyFile.custom
 
-GENERATED =				\
-	$(srcdir)/generated/Error.cs	\
-	$(srcdir)/generated/Flags.cs	\
-	$(srcdir)/generated/GKeyFile.cs
-	
-REFS =
-
-PKGS =					\
+ASSEMBLIES = 			\
 	-pkg:glib-sharp-2.0
 
-ASSEMBLY = $(ASSEMBLY_NAME).dll
-
-all: $(ASSEMBLY)
+all: gkeyfile-sharp.dll
 
 gkeyfile-api.raw: gkeyfile-sharp-sources.xml
 	$(GAPI2PARSER) gkeyfile-sharp-sources.xml
 
 gkeyfile-api.xml: gkeyfile-api.raw GKeyFile.metadata
+	@echo -e "\n*** Massaging the raw api into $@"
 	cp gkeyfile-api.raw gkeyfile-api.xml
+	chmod +w gkeyfile-api.xml
 	$(GAPI2FIXUP) --api=gkeyfile-api.xml --metadata=GKeyFile.metadata
 
-.generated_timestamp: gkeyfile-api.xml $(CUSTOMS)
-	$(GAPI2CODEGEN) --outdir=generated --customdir=$(srcdir) --generate gkeyfile-api.xml
-	touch $@
-$(ASSEMBLY): .generated_timestamp $(ASSEMBLY_SOURCES) $(ASSEMBLY_CUSTOMS)
-	$(CSC_LIB) -unsafe -out:$@ $(PKGS) $(REFS) $(ASSEMBLY_SOURCES) $(srcdir)/generated/*.cs
+generated/GKeyFile.cs: gkeyfile-api.xml $(CUSTOMS) $(GAPI2CODEGEN)
+	@echo -e "\n*** Generating C# code"
+	$(GAPI2CODEGEN) --outdir=generated --customdir=$(srcdir) --generate $(srcdir)/gkeyfile-api.xml
+
+gkeyfile-sharp.dll: generated/GKeyFile.cs $(CUSTOMS)
+	$(CSC_LIB) -unsafe -out:$@ $(PKGS) $(ASSEMBLIES) $(builddir)/generated/*.cs
 
 assemblydir = $(pkglibdir)
-assembly_DATA =			\
-	$(ASSEMBLY)
+assembly_DATA =			 	\
+	gkeyfile-sharp.dll
+
+CLEANFILES =				\
+	gkeyfile-sharp.dll		\
+	gkeyfile-sharp.dll.mdb	\
+	gkeyfile-api.xml
+
+DISTCLEANFILES =			\
+	generated/*.cs
 
 EXTRA_DIST =				\
-	$(ASSEMBLY_SOURCES)		\
-	$(ASSEMBLY_CUSTOMS)		\
-	$(ASSEMBLY_NAME)-sources.xml	\
+	$(CUSTOMS)			\
 	gkeyfile-api.raw		\
 	GKeyFile.metadata		\
 	gkeyfile-api.xml		\
-	.generated_timestamp		\
-	$(GENERATED)
-
-CLEANFILES =			\
-	$(ASSEMBLY)		\
-	$(ASSEMBLY).mdb
+	gkeyfile-sharp-sources.xml