From 80485a464da697b0b86279c98cd147e0b34e5a13 Mon Sep 17 00:00:00 2001
From: Bertrand Lorentz <bertrand.lorentz@gmail.com>
Date: Mon, 21 Apr 2014 16:12:14 +0200
Subject: [PATCH] build: Fix Makefile of valtest and opaquetest samples

Some parts were not taking into account the fact that the generated code
is now in a subfolder.
---
 sample/opaquetest/Makefile.am | 6 +++---
 sample/valtest/Makefile.am    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sample/opaquetest/Makefile.am b/sample/opaquetest/Makefile.am
index edf552b2c..17c6aac49 100644
--- a/sample/opaquetest/Makefile.am
+++ b/sample/opaquetest/Makefile.am
@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libopaque.la
 assemblies=../../glib/glib-sharp.dll ../../gio/gio-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll
 references=$(addprefix -r:, $(assemblies))
 
-opaquetest.exe: OpaqueTest.cs generated/*.cs $(assemblies)
+opaquetest.exe: OpaqueTest.cs $(GENERATED_SOURCES) $(assemblies)
 	$(CSC) $(CSFLAGS) -out:opaquetest.exe $(references) $(srcdir)/OpaqueTest.cs $(GENERATED_SOURCES)
 
 libopaque_la_SOURCES =	\
@@ -17,7 +17,7 @@ libopaque_la_LIBADD = $(GTK_LIBS)
 
 AM_CPPFLAGS = $(GTK_CFLAGS)
 
-generated/*.cs: opaque-api.xml
+$(GENERATED_SOURCES): opaque-api.xml
 	$(RUNTIME) ../../generator/gapi_codegen.exe --generate $(srcdir)/opaque-api.xml	\
 	--include=../../gtk/gtk-api.xml --include=../../gdk/gdk-api.xml 				\
 	--outdir=generated --assembly-name=opaque-sharp									\
@@ -32,7 +32,7 @@ install:
 CLEANFILES =			\
 	opaquetest.exe		\
 	opaquetest.exe.mdb	\
-	generated/*.cs
+	$(GENERATED_SOURCES)
 
 EXTRA_DIST =		\
 	OpaqueTest.cs	\
diff --git a/sample/valtest/Makefile.am b/sample/valtest/Makefile.am
index 05cf044f3..608970274 100644
--- a/sample/valtest/Makefile.am
+++ b/sample/valtest/Makefile.am
@@ -10,7 +10,7 @@ else
 VALOBJ=Gtksharp/Valobj.cs
 endif
 
-valtest.exe: Valtest.cs Valobj.cs $(assemblies)
+valtest.exe: Valtest.cs $(VALOBJ) $(assemblies)
 	$(CSC) $(CSFLAGS) -out:valtest.exe $(references) $(srcdir)/Valtest.cs $(VALOBJ)
 
 libvalobj_la_SOURCES =	\
@@ -23,7 +23,7 @@ libvalobj_la_LIBADD = $(GTK_LIBS)
 
 AM_CPPFLAGS = $(GTK_CFLAGS)
 
-Valobj.cs: valobj-api.xml
+$(VALOBJ): valobj-api.xml
 	$(RUNTIME) ../../generator/gapi_codegen.exe --generate $(srcdir)/valobj-api.xml	\
 	--include=../../gtk/gtk-api.xml --include=../../gdk/gdk-api.xml					\
 	--outdir=. --assembly-name=valobj-sharp											\
@@ -37,7 +37,7 @@ install:
 CLEANFILES =		\
 	valtest.exe	\
 	valtest.exe.mdb	\
-	Valobj.cs
+	$(VALOBJ)
 
 EXTRA_DIST =		\
 	Valtest.cs	\