[gnome-characters] build: Revert wrong workarounds for VPATH build

[Daiki Ueno <dueno src gnome org>]

commit 3f16f2e3e5856db4d976af71b9ed1ec863c4301f
Author: Daiki Ueno <dueno src gnome org>
Date:   Mon Feb 8 17:51:32 2016 +0900

    build: Revert wrong workarounds for VPATH build
    
    This reverts commit d2c7022a8bfdf4cbaff8b74a719ec19cd056ff6f and
    ded4b6fd365f05ebb609a2c4b75170064231914b, which turned out to be
    unnecessary.  The actual cause which prevented from reproducing the
    error was that gc.h from Boem GC was installed on the system :-/

 lib/Makefile.am |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 6db7a56..202f2ae 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,7 @@
 EXTRA_DIST = gen-confusables.py gen-scripts.py
 CLEANFILES =
+DISTCLEANFILES =
+MAINTAINERCLEANFILES =
 
 AM_CPPFLAGS =                                  \
         -I$(top_srcdir)                                \
@@ -23,16 +25,14 @@ libgc_la_SOURCES = $(libgc_la_sources) confusables.h scripts.h gc-enumtypes.h
 BUILT_SOURCES = gc-enumtypes.h gc-enumtypes.c
 
 gc-enumtypes.h: gc.h gc-enumtypes.h.template
-       $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --identifier-prefix Gc --symbol-prefix gc --template 
gc-enumtypes.h.template gc.h ) > $ -t && mv $ -t $@ || rm $ -t
+       $(AM_V_GEN) $(GLIB_MKENUMS) --identifier-prefix Gc --symbol-prefix gc --template 
$(srcdir)/gc-enumtypes.h.template $(srcdir)/gc.h > $ -t && mv $ -t $@ || rm $ -t
 gc-enumtypes.c: gc.h gc-enumtypes.c.template
-       $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --identifier-prefix Gc --symbol-prefix gc --template 
gc-enumtypes.c.template gc.h ) > $ -t && mv $ -t $@ || rm $ -t
+       $(AM_V_GEN) $(GLIB_MKENUMS) --identifier-prefix Gc --symbol-prefix gc --template 
$(srcdir)/gc-enumtypes.c.template $(srcdir)/gc.h > $ -t && mv $ -t $@ || rm $ -t
 
 EXTRA_DIST += gc-enumtypes.h.template gc-enumtypes.c.template
-CLEANFILES += *-t
 
 include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS = Gc-1.0.gir
-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=.
 
 Gc-1.0.gir: libgc.la Makefile
 Gc_1_0_gir_NAMESPACE = Gc
@@ -56,6 +56,6 @@ typelib_DATA = $(gir_DATA:.gir=.typelib)
 
 EXTRA_DIST += $(gir_DATA)
 CLEANFILES += $(typelib_DATA)
-DISTCLEANFILES = $(gir_DATA)
+DISTCLEANFILES += $(gir_DATA)
 
 -include $(top_srcdir)/git.mk