From 2c80538dfd524ebe2f63efbd02e49ab8be9d24fd Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 28 Sep 2023 10:46:03 +0000 Subject: [PATCH] cli: Move pakfire/pakfire-builder into a single file There is no point to have subdirectory for only one file when everything else is going into the lib. Signed-off-by: Michael Tremer --- Makefile.am | 4 +-- .../main.c => pakfire-builder.c} | 6 ++--- src/cli/{pakfire/main.c => pakfire.c} | 26 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) rename src/cli/{pakfire-builder/main.c => pakfire-builder.c} (98%) rename src/cli/{pakfire/main.c => pakfire.c} (95%) diff --git a/Makefile.am b/Makefile.am index 16a32fc64..486cacb2d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -385,7 +385,7 @@ bin_PROGRAMS += \ pakfire pakfire_SOURCES = \ - src/cli/pakfire/main.c + src/cli/pakfire.c pakfire_CPPFLAGS = \ $(AM_CPPFLAGS) \ @@ -407,7 +407,7 @@ bin_PROGRAMS += \ pakfire-builder pakfire_builder_SOURCES = \ - src/cli/pakfire-builder/main.c + src/cli/pakfire-builder.c pakfire_builder_CPPFLAGS = \ $(AM_CPPFLAGS) \ diff --git a/src/cli/pakfire-builder/main.c b/src/cli/pakfire-builder.c similarity index 98% rename from src/cli/pakfire-builder/main.c rename to src/cli/pakfire-builder.c index 65cb262a6..c1e0b3eca 100644 --- a/src/cli/pakfire-builder/main.c +++ b/src/cli/pakfire-builder.c @@ -28,9 +28,9 @@ #include #include -#include "../lib/command.h" -#include "../lib/terminal.h" -#include "../lib/version.h" +#include "lib/command.h" +#include "lib/terminal.h" +#include "lib/version.h" #define MAX_REPOS 16 diff --git a/src/cli/pakfire/main.c b/src/cli/pakfire.c similarity index 95% rename from src/cli/pakfire/main.c rename to src/cli/pakfire.c index 53ac6acdd..185138744 100644 --- a/src/cli/pakfire/main.c +++ b/src/cli/pakfire.c @@ -26,19 +26,19 @@ #include -#include "../lib/clean.h" -#include "../lib/command.h" -#include "../lib/info.h" -#include "../lib/install.h" -#include "../lib/provides.h" -#include "../lib/remove.h" -#include "../lib/repolist.h" -#include "../lib/requires.h" -#include "../lib/search.h" -#include "../lib/sync.h" -#include "../lib/terminal.h" -#include "../lib/update.h" -#include "../lib/version.h" +#include "lib/clean.h" +#include "lib/command.h" +#include "lib/info.h" +#include "lib/install.h" +#include "lib/provides.h" +#include "lib/remove.h" +#include "lib/repolist.h" +#include "lib/requires.h" +#include "lib/search.h" +#include "lib/sync.h" +#include "lib/terminal.h" +#include "lib/update.h" +#include "lib/version.h" #define MAX_REPOS 16 -- 2.47.2