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 <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 16a32fc64989e9d8d2e42e197e9c6f16e7365e7d..486cacb2d90ebdf479ea348eff2064450afc2704 100644 (file)
--- 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 65cb262a630d2004e77124476bad715bea3a95d2..c1e0b3eca4b6c7f2808f364c801ec8901833dd70 100644 (file)
--- a/src/cli/pakfire-builder/main.c
+++ b/src/cli/pakfire-builder.c
@@ -28,9 +28,9 @@
 #include <pakfire/pakfire.h>
 #include <pakfire/string.h>
 
-#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 53ac6acdd0f55c9ff462d86b5ec3b43eaa030270..1851387447e364d0a53892d4293155b7ef13a823 100644 (file)
--- a/src/cli/pakfire/main.c
+++ b/src/cli/pakfire.c
@@ -26,19 +26,19 @@
 
 #include <pakfire/pakfire.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"
+#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