[libical-glib] Fix issues in Bug 760791 and 760792

[Miao Yu <williamyu src gnome org>]

commit 24bfa41398d009dd514c3fc098555142d1f565fd
Author: William Yu <williamyu gnome org>
Date:   Tue Jan 19 16:18:57 2016 -0500

    Fix issues in Bug 760791 and 760792

 src/build-tools/Makefile.am |    1 +
 src/build-tools/generator.c |   13 ++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/build-tools/Makefile.am b/src/build-tools/Makefile.am
index ca86bb1..77df4f6 100644
--- a/src/build-tools/Makefile.am
+++ b/src/build-tools/Makefile.am
@@ -24,6 +24,7 @@ src_generator_LDADD = \
 EXTRA_DIST = \
        header-structure-boilerplate-template \
        header-template \
+       header-header-template \
        source-structure-boilerplate-template \
        source-template \
        $(NULL)
diff --git a/src/build-tools/generator.c b/src/build-tools/generator.c
index 7cedd11..9d50598 100644
--- a/src/build-tools/generator.c
+++ b/src/build-tools/generator.c
@@ -691,7 +691,6 @@ generate_header_method_protos (FILE *out, Structure *structure)
                                fwrite (typeName, sizeof (gchar), strlen (typeName), privateHeader);
                                fputc (';', privateHeader);
                                fputc ('\n', privateHeader);
-
                        }
                        generate_header_method_proto (privateHeader, method);
                } else {
@@ -1017,14 +1016,14 @@ generate_source_includes (FILE *out, Structure *structure)
        upperCamel = g_strconcat (structure->nameSpace, structure->name, NULL);
        lowerTrain = get_lower_train_from_upper_camel (upperCamel);
        g_free (upperCamel);
-       fwrite ("#include <libical-glib/", sizeof (gchar), strlen ("#include <libical-glib/"), out);
+       fwrite ("#include \"", sizeof (gchar), strlen ("#include \""), out);
        fwrite (lowerTrain, sizeof (gchar), strlen (lowerTrain), out);
-       fwrite (".h>\n", sizeof (gchar), strlen (".h>\n"), out);
+       fwrite (".h\"\n", sizeof (gchar), strlen (".h\"\n"), out);
        g_free (lowerTrain);
 
-       fwrite ("#include <libical-glib/", sizeof (gchar), strlen ("#include <libical-glib/"), out);
+       fwrite ("#include \"", sizeof (gchar), strlen ("#include \""), out);
        fwrite (PRIVATE_HEADER, sizeof (gchar), strlen (PRIVATE_HEADER), out);
-       fwrite (">\n", sizeof (gchar), strlen (">\n"), out);
+       fwrite ("\"\n", sizeof (gchar), strlen ("\"\n"), out);
                
        for (g_hash_table_iter_init (&iter_table, structure->dependencies); g_hash_table_iter_next 
(&iter_table, &key, &value);) {
                typeName = (gchar *)key;
@@ -1046,9 +1045,9 @@ generate_source_includes (FILE *out, Structure *structure)
        
        for (g_hash_table_iter_init (&iter_table, includeNames); g_hash_table_iter_next (&iter_table, &key, 
&value);) {
                includeName = (gchar *)key;
-               fwrite ("#include <libical-glib/", sizeof (gchar), strlen ("#include <libical-glib/"), out);
+               fwrite ("#include \"", sizeof (gchar), strlen ("#include \""), out);
                fwrite (includeName, sizeof (gchar), strlen (includeName), out);
-               fwrite (".h>\n", sizeof (gchar), strlen (".h>\n"), out);
+               fwrite (".h\"\n", sizeof (gchar), strlen (".h\"\n"), out);
        }
 
        fputc ('\n', out);