Rename source files to flatpak

12 files changed, 11 insertions, 11 deletions

diff --git a/builder/Makefile.am.inc b/builder/Makefile.am.inc
index 918baa8..c6d42b1 100644
--- a/builder/Makefile.am.inc
+++ b/builder/Makefile.am.inc
@@ -3,7 +3,7 @@ bin_PROGRAMS += \
 	$(NULL)
 
 xdg_app_builder_SOURCES = \
-	builder/xdg-app-builder-main.c \
+	builder/builder-main.c \
 	builder/builder-manifest.c \
 	builder/builder-manifest.h \
 	builder/builder-options.c \
diff --git a/builder/builder-cache.c b/builder/builder-cache.c
index 9c57af1..a401377 100644
--- a/builder/builder-cache.c
+++ b/builder/builder-cache.c
@@ -32,7 +32,7 @@
 #include "libglnx/libglnx.h"
 #include "libgsystem.h"
 
-#include "xdg-app-utils.h"
+#include "flatpak-utils.h"
 #include "builder-utils.h"
 #include "builder-cache.h"
 
diff --git a/builder/builder-context.c b/builder/builder-context.c
index 07d0e05..f0e127d 100644
--- a/builder/builder-context.c
+++ b/builder/builder-context.c
@@ -28,7 +28,7 @@
 #include <sys/statfs.h>
 #include <unistd.h>
 
-#include "xdg-app-utils.h"
+#include "flatpak-utils.h"
 #include "builder-context.h"
 
 struct BuilderContext
diff --git a/builder/xdg-app-builder-main.c b/builder/builder-main.c
index 41c5e18..41c5e18 100644
--- a/builder/xdg-app-builder-main.c
+++ b/builder/builder-main.c
diff --git a/builder/builder-manifest.c b/builder/builder-manifest.c
index d6e1545..95ae42b 100644
--- a/builder/builder-manifest.c
+++ b/builder/builder-manifest.c
@@ -29,7 +29,7 @@
 
 #include "builder-manifest.h"
 #include "builder-utils.h"
-#include "xdg-app-utils.h"
+#include "flatpak-utils.h"
 
 #include "libgsystem.h"
 #include "libglnx/libglnx.h"
diff --git a/builder/builder-module.c b/builder/builder-module.c
index ad0d815..178b071 100644
--- a/builder/builder-module.c
+++ b/builder/builder-module.c
@@ -31,7 +31,7 @@
 #include "libglnx/libglnx.h"
 #include "libgsystem.h"
 
-#include "xdg-app-utils.h"
+#include "flatpak-utils.h"
 #include "builder-utils.h"
 #include "builder-module.h"
 
diff --git a/builder/builder-source-archive.c b/builder/builder-source-archive.c
index 89a2423..66d4527 100644
--- a/builder/builder-source-archive.c
+++ b/builder/builder-source-archive.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <sys/statfs.h>
 
-#include "xdg-app-utils.h"
+#include "flatpak-utils.h"
 
 #include "builder-utils.h"
 #include "builder-source-archive.h"
diff --git a/builder/builder-source-bzr.c b/builder/builder-source-bzr.c
index eee4687..a2337c2 100644
--- a/builder/builder-source-bzr.c
+++ b/builder/builder-source-bzr.c
@@ -31,7 +31,7 @@
 
 #include "builder-source-bzr.h"
 #include "builder-utils.h"
-#include "xdg-app-utils.h"
+#include "flatpak-utils.h"
 
 struct BuilderSourceBzr
 {
diff --git a/builder/builder-source-file.c b/builder/builder-source-file.c
index 924d4b6..2756cfd 100644
--- a/builder/builder-source-file.c
+++ b/builder/builder-source-file.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <sys/statfs.h>
 
-#include "xdg-app-utils.h"
+#include "flatpak-utils.h"
 
 #include "builder-utils.h"
 #include "builder-source-file.h"
diff --git a/builder/builder-source-git.c b/builder/builder-source-git.c
index d190f6e..a9f42ef 100644
--- a/builder/builder-source-git.c
+++ b/builder/builder-source-git.c
@@ -32,7 +32,7 @@
 
 #include "builder-source-git.h"
 #include "builder-utils.h"
-#include "xdg-app-utils.h"
+#include "flatpak-utils.h"
 
 struct BuilderSourceGit
 {
diff --git a/builder/builder-source-patch.c b/builder/builder-source-patch.c
index 04811b1..5a2041a 100644
--- a/builder/builder-source-patch.c
+++ b/builder/builder-source-patch.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <sys/statfs.h>
 
-#include "xdg-app-utils.h"
+#include "flatpak-utils.h"
 
 #include "builder-utils.h"
 #include "builder-source-patch.h"
diff --git a/builder/builder-utils.c b/builder/builder-utils.c
index 8e6a88f..b82a127 100644
--- a/builder/builder-utils.c
+++ b/builder/builder-utils.c
@@ -29,7 +29,7 @@
 
 #include <string.h>
 
-#include "xdg-app-utils.h"
+#include "flatpak-utils.h"
 #include "builder-utils.h"
 
 char *