Almost there to pass distcheck.
authorCosimo Cecchi <cosimoc@gnome.org>
Mon, 4 Aug 2008 17:02:28 +0000 (4 19:02 +0200)
committerCosimo Cecchi <cosimoc@gnome.org>
Mon, 4 Aug 2008 17:02:28 +0000 (4 19:02 +0200)
libmmanager/Makefile.am
src/Makefile.am

index 9a43d80..054d684 100644 (file)
@@ -90,6 +90,7 @@ stamp_files =                                 \
 mm-type-builtins.c: stamp-mm-type-builtins.c Makefile
        @true
 stamp-mm-type-builtins.c: Makefile $(libmmanager_la_headers)
+       ( cd $(srcdir) && \
        $(GLIB_MKENUMS) \
                --fhead "#include <config.h>\n\n" \
                --fhead "#include \"mm-type-builtins.h\"\n\n" \
@@ -103,7 +104,7 @@ stamp-mm-type-builtins.c: Makefile $(libmmanager_la_headers)
                --vtail "      { 0, NULL, NULL }\n    };\n\n" \
                --vtail "    type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n  }\n\n" \
                --vtail "  return type;\n}\n\n" \
-               $(libmmanager_la_headers) > xgen-$(@F) \
+               $(libmmanager_la_headers) > xgen-$(@F) \
        && ( cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%) ) \
        && rm -f xgen-$(@F) \
        && echo timestamp > $(@F)
@@ -111,6 +112,7 @@ stamp-mm-type-builtins.c: Makefile $(libmmanager_la_headers)
 mm-type-builtins.h: stamp-mm-type-builtins.h Makefile
        @true
 stamp-mm-type-builtins.h: Makefile $(libmmanager_la_headers)
+       (cd $(srcdir) && \
        $(GLIB_MKENUMS) \
                --fhead "#ifndef __MM_TYPE_BUILTINS_H__\n" \
                --fhead "#define __MM_TYPE_BUILTINS_H__\n\n" \
@@ -121,7 +123,7 @@ stamp-mm-type-builtins.h: Makefile $(libmmanager_la_headers)
                --fprod "\n/* --- @filename@ --- */" \
                --eprod "#define MM_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \
                --eprod "GType @enum_name@_get_type (void);\n" \
-               $(libmmanager_la_headers) > xgen-$(@F) \
+               $(libmmanager_la_headers) > xgen-$(@F) \
        && ( cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%) ) \
        && rm -f xgen-$(@F) \
        && echo timestamp > $(@F)
index f20cbac..f5fdcd8 100644 (file)
@@ -20,8 +20,6 @@ mm_dbus_manager_headers = \
 mm_dbus_manager_SOURCES = \
        mm-dbus-manager-main.c \
        mm-dbus-manager.c \
-       mm-dbus-manager-type-builtins.c \
-       mm-dbus-manager-type-builtins.h \
        $(mm_dbus_manager_headers)
 
 mm_dbus_manager_CFLAGS = \
@@ -35,54 +33,11 @@ mm_dbus_manager_LDADD = \
 
 BUILT_SOURCES =                                        \
        mm-dbus-manager-client-bindings.h       \
-       mm-dbus-manager-server-bindings.h       \
-       mm-dbus-manager-type-builtins.c         \
-       mm-dbus-manager-type-builtins.h
+       mm-dbus-manager-server-bindings.h
 
 stamp_files =                                  \
        stamp-mm-dbus-manager-client-bindings.h \
-       stamp-mm-dbus-manager-server-bindings.h \
-       stamp-mm-dbus-manager-type-builtins.c   \
-       stamp-mm-dbus-manager-type-builtins.h
-
-mm-dbus-manager-type-builtins.c: stamp-mm-dbus-manager-type-builtins.c Makefile
-       @true
-stamp-mm-dbus-manager-type-builtins.c: Makefile $(mm_dbus_manager_headers)
-       $(GLIB_MKENUMS) \
-               --fhead "#include <config.h>\n\n" \
-               --fhead "#include \"mm-type-builtins.h\"\n\n" \
-               --fprod "\n/* enumerations from \"@filename@\" */" \
-               --fprod "\n#include \"@filename@\"" \
-               --vhead "GType\n@enum_name@_get_type (void)\n{\n" \
-               --vhead "  static GType type = 0;\n\n" \
-               --vhead "  if (G_UNLIKELY (type == 0))\n  {\n" \
-               --vhead "    static const G@Type@Value _@enum_name@_values[] = {" \
-               --vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
-               --vtail "      { 0, NULL, NULL }\n    };\n\n" \
-               --vtail "    type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n  }\n\n" \
-               --vtail "  return type;\n}\n\n" \
-               $(mm_dbus_manager_headers) > xgen-$(@F) \
-       && ( cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%) ) \
-       && rm -f xgen-$(@F) \
-       && echo timestamp > $(@F)
-
-mm-dbus-manager-type-builtins.h: stamp-mm-dbus-manager-type-builtins.h Makefile
-       @true
-stamp-mm-dbus-manager-type-builtins.h: Makefile $(mm_dbus_manager_headers)
-       $(GLIB_MKENUMS) \
-               --fhead "#ifndef __MM_TYPE_BUILTINS_H__\n" \
-               --fhead "#define __MM_TYPE_BUILTINS_H__\n\n" \
-               --fhead "#include <glib-object.h>\n\n" \
-               --fhead "G_BEGIN_DECLS\n\n" \
-               --ftail "G_END_DECLS\n\n" \
-               --ftail "#endif /* __MM_TYPE_BUILTINS_H__ */\n" \
-               --fprod "\n/* --- @filename@ --- */" \
-               --eprod "#define MM_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \
-               --eprod "GType @enum_name@_get_type (void);\n" \
-               $(mm_dbus_manager_headers) > xgen-$(@F) \
-       && ( cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%) ) \
-       && rm -f xgen-$(@F) \
-       && echo timestamp > $(@F)
+       stamp-mm-dbus-manager-server-bindings.h
 
 mm-dbus-manager-server-bindings.h: stamp-mm-dbus-manager-server-bindings.h
        @true