Actually include the enum types in the build

 * Since BUILT_SOURCES is not in the build, include in the
   build and fix up other build errors.

https://bugs.freedesktop.org/show_bug.cgi?id=48038

5 files changed, 2 insertions, 37 deletions

diff --git a/lib/packagekit-glib2/Makefile.am b/lib/packagekit-glib2/Makefile.am
index d5adab6e..d693dd27 100644
--- a/lib/packagekit-glib2/Makefile.am
+++ b/lib/packagekit-glib2/Makefile.am
@@ -108,6 +108,8 @@ libpackagekit_glib2_la_SOURCES =				\
 	pk-distro-upgrade.h					\
 	pk-enum.c						\
 	pk-enum.h						\
+	pk-enum-types.c						\
+	pk-enum-types.h						\
 	pk-error.c						\
 	pk-error.h						\
 	pk-eula-required.c					\
diff --git a/lib/packagekit-glib2/pk-catalog.c b/lib/packagekit-glib2/pk-catalog.c
index 0a56c1f9..4bcd19d3 100644
--- a/lib/packagekit-glib2/pk-catalog.c
+++ b/lib/packagekit-glib2/pk-catalog.c
@@ -102,21 +102,6 @@ pk_catalog_error_quark (void)
  * pk_catalog_error_get_type:
  **/
 #define ENUM_ENTRY(NAME, DESC) { NAME, "" #NAME "", DESC }
-GType
-pk_catalog_error_get_type (void)
-{
-	static GType etype = 0;
-
-	if (etype == 0) {
-		static const GEnumValue values[] =
-		{
-			ENUM_ENTRY (PK_CATALOG_ERROR_FAILED, "Failed"),
-			{ 0, NULL, NULL }
-		};
-		etype = g_enum_register_static ("PkCatalogError", values);
-	}
-	return etype;
-}
 
 /**
  * pk_catalog_mode_to_string:
diff --git a/lib/packagekit-glib2/pk-catalog.h b/lib/packagekit-glib2/pk-catalog.h
index 2e7c3602..0e5ab589 100644
--- a/lib/packagekit-glib2/pk-catalog.h
+++ b/lib/packagekit-glib2/pk-catalog.h
@@ -73,7 +73,6 @@ struct _PkCatalogClass
 };
 
 GQuark		 pk_catalog_error_quark			(void);
-GType		 pk_catalog_error_get_type		(void);
 GType		 pk_catalog_get_type			(void);
 PkCatalog	*pk_catalog_new				(void);
 void		 pk_catalog_test			(gpointer		 user_data);
diff --git a/lib/packagekit-glib2/pk-service-pack.c b/lib/packagekit-glib2/pk-service-pack.c
index 339012ee..bade4b3d 100644
--- a/lib/packagekit-glib2/pk-service-pack.c
+++ b/lib/packagekit-glib2/pk-service-pack.c
@@ -112,26 +112,6 @@ pk_service_pack_error_quark (void)
  * pk_service_pack_error_get_type:
  **/
 #define ENUM_ENTRY(NAME, DESC) { NAME, "" #NAME "", DESC }
-GType
-pk_service_pack_error_get_type (void)
-{
-	static GType etype = 0;
-
-	if (etype == 0) {
-		static const GEnumValue values[] =
-		{
-			ENUM_ENTRY (PK_SERVICE_PACK_ERROR_FAILED_SETUP, "FailedSetup"),
-			ENUM_ENTRY (PK_SERVICE_PACK_ERROR_FAILED_DOWNLOAD, "FailedDownload"),
-			ENUM_ENTRY (PK_SERVICE_PACK_ERROR_FAILED_EXTRACTION, "FailedExtraction"),
-			ENUM_ENTRY (PK_SERVICE_PACK_ERROR_FAILED_CREATE, "FailedCreate"),
-			ENUM_ENTRY (PK_SERVICE_PACK_ERROR_NOTHING_TO_DO, "NothingToDo"),
-			ENUM_ENTRY (PK_SERVICE_PACK_ERROR_NOT_COMPATIBLE, "NotCompatible"),
-			{ 0, NULL, NULL }
-		};
-		etype = g_enum_register_static ("PkServicePackError", values);
-	}
-	return etype;
-}
 
 /**
  * pk_service_pack_check_metadata_file:
diff --git a/lib/packagekit-glib2/pk-service-pack.h b/lib/packagekit-glib2/pk-service-pack.h
index 3a7cbebd..469655b4 100644
--- a/lib/packagekit-glib2/pk-service-pack.h
+++ b/lib/packagekit-glib2/pk-service-pack.h
@@ -77,7 +77,6 @@ struct _PkServicePackClass
 };
 
 GQuark		 pk_service_pack_error_quark		(void);
-GType		 pk_service_pack_error_get_type		(void);
 GType		 pk_service_pack_get_type		(void);
 PkServicePack	*pk_service_pack_new			(void);
 void		 pk_service_pack_test			(gpointer		 user_data);