Move builder/ to src/

Makefile.am

@@ -47,7 +47,7 @@ libglnx_libs := $(BASE_LIBS)
 include libglnx/Makefile-libglnx.am.inc
 
 include common/Makefile.am.inc
-include builder/Makefile.am.inc
+include src/Makefile.am.inc
 include tests/Makefile.am.inc
 
 EXTRA_DIST += README.md

builder/Makefile.am.inc

@@ -1,45 +0,0 @@
-bin_PROGRAMS += \
-	flatpak-builder \
-	$(NULL)
-
-flatpak_builder_SOURCES = \
-	builder/builder-main.c \
-	builder/builder-manifest.c \
-	builder/builder-manifest.h \
-	builder/builder-options.c \
-	builder/builder-options.h \
-	builder/builder-extension.c \
-	builder/builder-extension.h \
-	builder/builder-module.c \
-	builder/builder-module.h \
-	builder/builder-post-process.c \
-	builder/builder-post-process.h \
-	builder/builder-source.c \
-	builder/builder-source.h \
-	builder/builder-source-archive.c \
-	builder/builder-source-archive.h \
-	builder/builder-source-git.c \
-	builder/builder-source-git.h \
-	builder/builder-source-bzr.c \
-	builder/builder-source-bzr.h \
-	builder/builder-source-file.c \
-	builder/builder-source-file.h \
-	builder/builder-source-script.c \
-	builder/builder-source-script.h \
-	builder/builder-source-shell.c \
-	builder/builder-source-shell.h \
-	builder/builder-source-patch.c \
-	builder/builder-source-patch.h \
-	builder/builder-context.c \
-	builder/builder-context.h \
-	builder/builder-cache.c \
-	builder/builder-cache.h \
-	builder/builder-utils.c \
-	builder/builder-utils.h \
-	builder/builder-git.c \
-	builder/builder-git.h \
-	$(NULL)
-
-flatpak_builder_LDADD = $(AM_LDADD) $(BASE_LIBS) $(OSTREE_LIBS) $(JSON_LIBS) $(SOUP_LIBS) $(LIBELF_LIBS) \
-			libglnx.la libflatpak-common.la
-flatpak_builder_CFLAGS = $(AM_CFLAGS) $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(JSON_CFLAGS) $(SOUP_CFLAGS)

src/Makefile.am.inc

@@ -0,0 +1,45 @@
+bin_PROGRAMS += \
+	flatpak-builder \
+	$(NULL)
+
+flatpak_builder_SOURCES = \
+	src/builder-main.c \
+	src/builder-manifest.c \
+	src/builder-manifest.h \
+	src/builder-options.c \
+	src/builder-options.h \
+	src/builder-extension.c \
+	src/builder-extension.h \
+	src/builder-module.c \
+	src/builder-module.h \
+	src/builder-post-process.c \
+	src/builder-post-process.h \
+	src/builder-source.c \
+	src/builder-source.h \
+	src/builder-source-archive.c \
+	src/builder-source-archive.h \
+	src/builder-source-git.c \
+	src/builder-source-git.h \
+	src/builder-source-bzr.c \
+	src/builder-source-bzr.h \
+	src/builder-source-file.c \
+	src/builder-source-file.h \
+	src/builder-source-script.c \
+	src/builder-source-script.h \
+	src/builder-source-shell.c \
+	src/builder-source-shell.h \
+	src/builder-source-patch.c \
+	src/builder-source-patch.h \
+	src/builder-context.c \
+	src/builder-context.h \
+	src/builder-cache.c \
+	src/builder-cache.h \
+	src/builder-utils.c \
+	src/builder-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
+flatpak_builder_CFLAGS = $(AM_CFLAGS) $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(JSON_CFLAGS) $(SOUP_CFLAGS)