diff --git a/Makefile.am b/Makefile.am index 0f0785b3..4e28b427 100644 --- a/Makefile.am +++ b/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 diff --git a/common/Makefile.am.inc b/common/Makefile.am.inc deleted file mode 100644 index fcfce656..00000000 --- a/common/Makefile.am.inc +++ /dev/null @@ -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) diff --git a/configure.ac b/configure.ac index 3c6358de..cfa0a7df 100644 --- a/configure.ac +++ b/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]) diff --git a/src/Makefile.am.inc b/src/Makefile.am.inc index d6597f1e..2ac19461 100644 --- a/src/Makefile.am.inc +++ b/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) diff --git a/src/builder-cache.c b/src/builder-cache.c index 5924339e..6350aa28 100644 --- a/src/builder-cache.c +++ b/src/builder-cache.c @@ -31,7 +31,7 @@ #include #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" diff --git a/src/builder-context.c b/src/builder-context.c index d7b29871..cffb72c7 100644 --- a/src/builder-context.c +++ b/src/builder-context.c @@ -32,7 +32,7 @@ #include #include -#include "flatpak-utils.h" +#include "builder-flatpak-utils.h" #include "builder-context.h" #include "builder-cache.h" #include "builder-utils.h" diff --git a/src/builder-extension.c b/src/builder-extension.c index 5634ba5e..132ee230 100644 --- a/src/builder-extension.c +++ b/src/builder-extension.c @@ -31,7 +31,7 @@ #include #include "libglnx/libglnx.h" -#include "flatpak-utils.h" +#include "builder-flatpak-utils.h" #include "builder-utils.h" #include "builder-extension.h" diff --git a/common/flatpak-utils.c b/src/builder-flatpak-utils.c similarity index 99% rename from common/flatpak-utils.c rename to src/builder-flatpak-utils.c index f5e27161..da09eb83 100644 --- a/common/flatpak-utils.c +++ b/src/builder-flatpak-utils.c @@ -20,7 +20,7 @@ #include "config.h" -#include "flatpak-utils.h" +#include "builder-flatpak-utils.h" #include diff --git a/common/flatpak-utils.h b/src/builder-flatpak-utils.h similarity index 100% rename from common/flatpak-utils.h rename to src/builder-flatpak-utils.h diff --git a/src/builder-git.c b/src/builder-git.c index 049d5cc6..9eccd5ca 100644 --- a/src/builder-git.c +++ b/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, diff --git a/src/builder-main.c b/src/builder-main.c index 48c3c44b..17580579 100644 --- a/src/builder-main.c +++ b/src/builder-main.c @@ -28,7 +28,7 @@ #include #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" diff --git a/src/builder-manifest.c b/src/builder-manifest.c index 7997a865..08c42050 100644 --- a/src/builder-manifest.c +++ b/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" diff --git a/src/builder-manifest.h b/src/builder-manifest.h index 09110e91..9cc4a711 100644 --- a/src/builder-manifest.h +++ b/src/builder-manifest.h @@ -23,7 +23,7 @@ #include -#include "flatpak-utils.h" +#include "builder-flatpak-utils.h" #include "builder-options.h" #include "builder-module.h" #include "builder-cache.h" diff --git a/src/builder-module.c b/src/builder-module.c index e7175a9d..1314fcdd 100644 --- a/src/builder-module.c +++ b/src/builder-module.c @@ -31,7 +31,7 @@ #include #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" diff --git a/src/builder-post-process.c b/src/builder-post-process.c index fae7fcba..744ff53d 100644 --- a/src/builder-post-process.c +++ b/src/builder-post-process.c @@ -30,7 +30,7 @@ #include #include "libglnx/libglnx.h" -#include "flatpak-utils.h" +#include "builder-flatpak-utils.h" #include "builder-utils.h" #include "builder-post-process.h" diff --git a/src/builder-source-archive.c b/src/builder-source-archive.c index c6a8099b..a0cab503 100644 --- a/src/builder-source-archive.c +++ b/src/builder-source-archive.c @@ -27,7 +27,7 @@ #include #include -#include "flatpak-utils.h" +#include "builder-flatpak-utils.h" #include "builder-utils.h" #include "builder-source-archive.h" diff --git a/src/builder-source-bzr.c b/src/builder-source-bzr.c index 62eb8ed0..f5d74da6 100644 --- a/src/builder-source-bzr.c +++ b/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 { diff --git a/src/builder-source-file.c b/src/builder-source-file.c index d6792bd1..81cb910a 100644 --- a/src/builder-source-file.c +++ b/src/builder-source-file.c @@ -27,7 +27,7 @@ #include #include -#include "flatpak-utils.h" +#include "builder-flatpak-utils.h" #include "builder-utils.h" #include "builder-source-file.h" diff --git a/src/builder-source-git.c b/src/builder-source-git.c index 87f28682..6a99afa7 100644 --- a/src/builder-source-git.c +++ b/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 { diff --git a/src/builder-source-patch.c b/src/builder-source-patch.c index ff35a2ff..10673a8c 100644 --- a/src/builder-source-patch.c +++ b/src/builder-source-patch.c @@ -27,7 +27,7 @@ #include #include -#include "flatpak-utils.h" +#include "builder-flatpak-utils.h" #include "builder-utils.h" #include "builder-source-patch.h" diff --git a/src/builder-source-script.c b/src/builder-source-script.c index 2c300da2..4f9394a8 100644 --- a/src/builder-source-script.c +++ b/src/builder-source-script.c @@ -27,7 +27,7 @@ #include #include -#include "flatpak-utils.h" +#include "builder-flatpak-utils.h" #include "builder-utils.h" #include "builder-source-script.h" diff --git a/src/builder-source-shell.c b/src/builder-source-shell.c index 3bea7dac..5e8a56ab 100644 --- a/src/builder-source-shell.c +++ b/src/builder-source-shell.c @@ -27,7 +27,7 @@ #include #include -#include "flatpak-utils.h" +#include "builder-flatpak-utils.h" #include "builder-utils.h" #include "builder-source-shell.h" diff --git a/src/builder-utils.c b/src/builder-utils.c index 388de9bc..38f1a6a8 100644 --- a/src/builder-utils.c +++ b/src/builder-utils.c @@ -36,7 +36,7 @@ #include #include -#include "flatpak-utils.h" +#include "builder-flatpak-utils.h" #include "builder-utils.h" char *