Move common/flatpak-utils.* to src/builder-flatpak-utils.*

Makefile.am

@@ -27,8 +27,6 @@ AM_CPPFLAGS =							\
 	-DFLATPAK_BASEDIR=\"$(pkgdatadir)\"			\
 	-DG_LOG_DOMAIN=\"flatpak-builder\"			\
 	-I$(srcdir)/libglnx					\
-	-I$(srcdir)/common					\
-	-I$(builddir)/common					\
 	-include "config.h"					\
 	$(NULL)
 
@@ -46,7 +44,6 @@ libglnx_cflags := \
 libglnx_libs := $(BASE_LIBS)
 include libglnx/Makefile-libglnx.am.inc
 
-include common/Makefile.am.inc
 include src/Makefile.am.inc
 include tests/Makefile.am.inc
 

common/Makefile.am.inc

@@ -1,22 +0,0 @@
-noinst_LTLIBRARIES += libflatpak-common.la
-
-BUILT_SOURCES += $(nodist_libflatpak_common_la_SOURCES)
-CLEANFILES += $(nodist_libflatpak_common_la_SOURCES)
-
-libflatpak_common_la_SOURCES = \
-	common/flatpak-utils.c \
-	common/flatpak-utils.h \
-	$(NULL)
-
-libflatpak_common_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(BASE_CFLAGS) \
-	$(HIDDEN_VISIBILITY_CFLAGS) \
-	$(OSTREE_CFLAGS) \
-	$(SOUP_CFLAGS) \
-	$(JSON_CFLAGS) \
-	$(XAUTH_CFLAGS) \
-	$(LIBSECCOMP_CFLAGS) \
-	$(INTERNAL_GPGME_CFLAGS) \
-	$(NULL)
-libflatpak_common_la_LIBADD = $(AM_LIBADD) libglnx.la $(BASE_LIBS) $(OSTREE_LIBS) $(SOUP_LIBS) $(JSON_LIBS) $(XAUTH_LIBS) $(LIBSECCOMP_LIBS) $(INTERNAL_GPGME_LIBS)

configure.ac

@@ -41,7 +41,7 @@ AC_DISABLE_STATIC
 LT_PREREQ([2.2.6])
 LT_INIT([disable-static])
 
-AC_CONFIG_SRCDIR([common/flatpak-utils.c])
+AC_CONFIG_SRCDIR([src/builder-main.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([1.13.4 no-define no-dist-gzip dist-xz tar-ustar foreign subdir-objects])

src/Makefile.am.inc

@@ -36,10 +36,12 @@ flatpak_builder_SOURCES = \
 	src/builder-cache.h \
 	src/builder-utils.c \
 	src/builder-utils.h \
+	src/builder-flatpak-utils.c \
+	src/builder-flatpak-utils.h \
 	src/builder-git.c \
 	src/builder-git.h \
 	$(NULL)
 
 flatpak_builder_LDADD = $(AM_LDADD) $(BASE_LIBS) $(OSTREE_LIBS) $(JSON_LIBS) $(SOUP_LIBS) $(LIBELF_LIBS) \
-			libglnx.la libflatpak-common.la
+			libglnx.la
 flatpak_builder_CFLAGS = $(AM_CFLAGS) $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(JSON_CFLAGS) $(SOUP_CFLAGS)

src/builder-cache.c

@@ -31,7 +31,7 @@
 #include <ostree.h>
 #include "libglnx/libglnx.h"
 
-#include "flatpak-utils.h"
+#include "builder-flatpak-utils.h"
 #include "builder-utils.h"
 #include "builder-cache.h"
 #include "builder-context.h"

src/builder-context.c

@@ -32,7 +32,7 @@
 #include <sys/resource.h>
 
 #include <glib/gi18n.h>
-#include "flatpak-utils.h"
+#include "builder-flatpak-utils.h"
 #include "builder-context.h"
 #include "builder-cache.h"
 #include "builder-utils.h"

src/builder-extension.c

@@ -31,7 +31,7 @@
 #include <gio/gio.h>
 #include "libglnx/libglnx.h"
 
-#include "flatpak-utils.h"
+#include "builder-flatpak-utils.h"
 #include "builder-utils.h"
 #include "builder-extension.h"
 

src/builder-flatpak-utils.c

@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include "flatpak-utils.h"
+#include "builder-flatpak-utils.h"
 
 #include <glib/gi18n.h>
 

src/builder-git.c

@@ -31,7 +31,7 @@
 
 #include "builder-git.h"
 #include "builder-utils.h"
-#include "flatpak-utils.h"
+#include "builder-flatpak-utils.h"
 
 static gboolean
 git (GFile   *dir,

src/builder-main.c

@@ -28,7 +28,7 @@
 #include <gio/gio.h>
 #include "libglnx/libglnx.h"
 
-#include "flatpak-utils.h"
+#include "builder-flatpak-utils.h"
 #include "builder-manifest.h"
 #include "builder-utils.h"
 #include "builder-git.h"

src/builder-manifest.c

@@ -29,7 +29,7 @@
 
 #include "builder-manifest.h"
 #include "builder-utils.h"
-#include "flatpak-utils.h"
+#include "builder-flatpak-utils.h"
 #include "builder-post-process.h"
 #include "builder-extension.h"
 

src/builder-manifest.h

@@ -23,7 +23,7 @@
 
 #include <json-glib/json-glib.h>
 
-#include "flatpak-utils.h"
+#include "builder-flatpak-utils.h"
 #include "builder-options.h"
 #include "builder-module.h"
 #include "builder-cache.h"

src/builder-module.c

@@ -31,7 +31,7 @@
 #include <gio/gio.h>
 #include "libglnx/libglnx.h"
 
-#include "flatpak-utils.h"
+#include "builder-flatpak-utils.h"
 #include "builder-utils.h"
 #include "builder-module.h"
 #include "builder-post-process.h"

src/builder-post-process.c

@@ -30,7 +30,7 @@
 #include <gio/gio.h>
 #include "libglnx/libglnx.h"
 
-#include "flatpak-utils.h"
+#include "builder-flatpak-utils.h"
 #include "builder-utils.h"
 #include "builder-post-process.h"
 

src/builder-source-archive.c

@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <sys/statfs.h>
 
-#include "flatpak-utils.h"
+#include "builder-flatpak-utils.h"
 
 #include "builder-utils.h"
 #include "builder-source-archive.h"

src/builder-source-bzr.c

@@ -31,7 +31,7 @@
 
 #include "builder-source-bzr.h"
 #include "builder-utils.h"
-#include "flatpak-utils.h"
+#include "builder-flatpak-utils.h"
 
 struct BuilderSourceBzr
 {

src/builder-source-file.c

@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <sys/statfs.h>
 
-#include "flatpak-utils.h"
+#include "builder-flatpak-utils.h"
 
 #include "builder-utils.h"
 #include "builder-source-file.h"

src/builder-source-git.c

@@ -32,7 +32,7 @@
 #include "builder-source-git.h"
 #include "builder-git.h"
 #include "builder-utils.h"
-#include "flatpak-utils.h"
+#include "builder-flatpak-utils.h"
 
 struct BuilderSourceGit
 {

src/builder-source-patch.c

@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <sys/statfs.h>
 
-#include "flatpak-utils.h"
+#include "builder-flatpak-utils.h"
 
 #include "builder-utils.h"
 #include "builder-source-patch.h"

src/builder-source-script.c

@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <sys/statfs.h>
 
-#include "flatpak-utils.h"
+#include "builder-flatpak-utils.h"
 #include "builder-utils.h"
 #include "builder-source-script.h"
 

src/builder-source-shell.c

@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <sys/statfs.h>
 
-#include "flatpak-utils.h"
+#include "builder-flatpak-utils.h"
 #include "builder-utils.h"
 #include "builder-source-shell.h"
 

src/builder-utils.c

@@ -36,7 +36,7 @@
 #include <gio/gunixoutputstream.h>
 #include <gio/gunixinputstream.h>
 
-#include "flatpak-utils.h"
+#include "builder-flatpak-utils.h"
 #include "builder-utils.h"
 
 char *