moved cmdline.c to common code

(This used to be ctdb commit 32b31a6b91a19fc0c5225cb88c35cc1d14b4a6df)

diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in
index e700f4bf1e21ce568587562fea048dbaea9fe2bb..14e4487e6d3657781b68e0f7a7fc161cfeba6dd4 100644 (file)
--- a/ctdb/Makefile.in
+++ b/ctdb/Makefile.in
@@ -22,7 +22,7 @@ EVENTS_OBJ = lib/events/events.o lib/events/events_standard.o
 
 CTDB_COMMON_OBJ = common/ctdb.o common/ctdb_daemon.o common/ctdb_client.o common/ctdb_io.o common/util.o common/ctdb_util.o \
        common/ctdb_call.o common/ctdb_ltdb.o common/ctdb_lockwait.o common/ctdb_message.o \
-       lib/util/idtree.o lib/util/db_wrap.o
+       common/cmdline.o lib/util/idtree.o lib/util/db_wrap.o
 
 CTDB_TCP_OBJ = tcp/tcp_connect.o tcp/tcp_io.o tcp/tcp_init.o
 
@@ -49,41 +49,41 @@ showflags:
 dirs:
        @mkdir -p $(DIRS)
 
-bin/ctdb_test: $(OBJS) tests/ctdb_test.o tests/cmdline.o
+bin/ctdb_test: $(OBJS) tests/ctdb_test.o
        @echo Linking $@
-       @$(CC) $(CFLAGS) -o $@ tests/ctdb_test.o tests/cmdline.o $(OBJS) $(LIB_FLAGS)
+       @$(CC) $(CFLAGS) -o $@ tests/ctdb_test.o $(OBJS) $(LIB_FLAGS)
 
-bin/ctdbd: $(OBJS) direct/ctdbd.o tests/cmdline.o
+bin/ctdbd: $(OBJS) direct/ctdbd.o 
        @echo Linking $@
-       @$(CC) $(CFLAGS) -o $@ direct/ctdbd.o tests/cmdline.o $(OBJS) $(LIB_FLAGS)
+       @$(CC) $(CFLAGS) -o $@ direct/ctdbd.o $(OBJS) $(LIB_FLAGS)
 
 bin/ctdbd_test: $(OBJS) direct/ctdbd_test.o
        @echo Linking $@
        @$(CC) $(CFLAGS) -o $@ direct/ctdbd_test.o 
 
-bin/ctdb_bench: $(OBJS) tests/ctdb_bench.o tests/cmdline.o
+bin/ctdb_bench: $(OBJS) tests/ctdb_bench.o 
        @echo Linking $@
-       @$(CC) $(CFLAGS) -o $@ tests/ctdb_bench.o tests/cmdline.o $(OBJS) $(LIB_FLAGS)
+       @$(CC) $(CFLAGS) -o $@ tests/ctdb_bench.o $(OBJS) $(LIB_FLAGS)
 
-bin/ctdb_fetch: $(OBJS) tests/ctdb_fetch.o tests/cmdline.o
+bin/ctdb_fetch: $(OBJS) tests/ctdb_fetch.o 
        @echo Linking $@
-       @$(CC) $(CFLAGS) -o $@ tests/ctdb_fetch.o tests/cmdline.o $(OBJS) $(LIB_FLAGS)
+       @$(CC) $(CFLAGS) -o $@ tests/ctdb_fetch.o $(OBJS) $(LIB_FLAGS)
 
-bin/ctdb_fetch1: $(OBJS) tests/ctdb_fetch1.o tests/cmdline.o
+bin/ctdb_fetch1: $(OBJS) tests/ctdb_fetch1.o 
        @echo Linking $@
-       @$(CC) $(CFLAGS) -o $@ tests/ctdb_fetch1.o tests/cmdline.o $(OBJS) $(LIB_FLAGS)
+       @$(CC) $(CFLAGS) -o $@ tests/ctdb_fetch1.o $(OBJS) $(LIB_FLAGS)
 
-bin/ctdb_messaging: $(OBJS) tests/ctdb_messaging.o tests/cmdline.o
+bin/ctdb_messaging: $(OBJS) tests/ctdb_messaging.o 
        @echo Linking $@
-       @$(CC) $(CFLAGS) -o $@ tests/ctdb_messaging.o tests/cmdline.o $(OBJS) $(LIB_FLAGS)
+       @$(CC) $(CFLAGS) -o $@ tests/ctdb_messaging.o $(OBJS) $(LIB_FLAGS)
 
 bin/ibwrapper_test: $(OBJS) ib/ibwrapper_test.o
        @echo Linking $@
        @$(CC) $(CFLAGS) -o $@ ib/ibwrapper_test.o $(OBJS) $(LIB_FLAGS)
 
-bin/lockwait: $(OBJS) tests/lockwait.o tests/cmdline.o
+bin/lockwait: $(OBJS) tests/lockwait.o 
        @echo Linking $@
-       @$(CC) $(CFLAGS) -o $@ tests/lockwait.o tests/cmdline.o $(OBJS) $(LIB_FLAGS)
+       @$(CC) $(CFLAGS) -o $@ tests/lockwait.o $(OBJS) $(LIB_FLAGS)
 
 clean:
        rm -f *.o */*.o */*/*.o

diff --git a/ctdb/tests/cmdline.c b/ctdb/common/cmdline.c
similarity index 100%
rename from ctdb/tests/cmdline.c
rename to ctdb/common/cmdline.c

diff --git a/ctdb/direct/ctdbd.c b/ctdb/direct/ctdbd.c
index bfd73d551b962246c38309ae7b528f574b39d67f..674b54d47a1fde45b7fdc29d2ea08fc5c1b281c2 100644 (file)
--- a/ctdb/direct/ctdbd.c
+++ b/ctdb/direct/ctdbd.c
@@ -23,7 +23,7 @@
 #include "system/filesys.h"
 #include "popt.h"
 #include "system/wait.h"
-#include "tests/cmdline.h"
+#include "cmdline.h"
 
 static void block_signal(int signum)
 {

diff --git a/ctdb/tests/cmdline.h b/ctdb/include/cmdline.h
similarity index 100%
rename from ctdb/tests/cmdline.h
rename to ctdb/include/cmdline.h

diff --git a/ctdb/tests/ctdb_bench.c b/ctdb/tests/ctdb_bench.c
index 37c095c0c0410a828c3f8cdb0ca6fc2abc5f94c7..8df084b4dc1495937eaea7b9430096e3a9cd9ed9 100644 (file)
--- a/ctdb/tests/ctdb_bench.c
+++ b/ctdb/tests/ctdb_bench.c
@@ -22,7 +22,7 @@
 #include "lib/events/events.h"
 #include "system/filesys.h"
 #include "popt.h"
-#include "tests/cmdline.h"
+#include "cmdline.h"
 
 #include <sys/time.h>
 #include <time.h>

diff --git a/ctdb/tests/ctdb_fetch.c b/ctdb/tests/ctdb_fetch.c
index 1ae8e8aafda1a1d9d5be963d86d55dee1cb40fe8..91fff3825dfc9c32215fd57afa88cc0c38164fd5 100644 (file)
--- a/ctdb/tests/ctdb_fetch.c
+++ b/ctdb/tests/ctdb_fetch.c
@@ -22,7 +22,7 @@
 #include "lib/events/events.h"
 #include "system/filesys.h"
 #include "popt.h"
-#include "tests/cmdline.h"
+#include "cmdline.h"
 
 #include <sys/time.h>
 #include <time.h>

diff --git a/ctdb/tests/ctdb_fetch1.c b/ctdb/tests/ctdb_fetch1.c
index 635311c9980925ad45f6f179de077c578dc2acb8..b362eb1510b2053eb538c08763fb32136ad5eea4 100644 (file)
--- a/ctdb/tests/ctdb_fetch1.c
+++ b/ctdb/tests/ctdb_fetch1.c
@@ -24,7 +24,7 @@
 #include "popt.h"
 #include "ctdb.h"
 #include "ctdb_private.h"
-#include "tests/cmdline.h"
+#include "cmdline.h"
 
 #define PARENT_SRVID   0
 #define CHILD1_SRVID   1

diff --git a/ctdb/tests/ctdb_messaging.c b/ctdb/tests/ctdb_messaging.c
index d02c2116e80c4e69220da1b0055aef2ec62d0afb..b21170d4f232f3bad227d068dc12e80f95f71964 100644 (file)
--- a/ctdb/tests/ctdb_messaging.c
+++ b/ctdb/tests/ctdb_messaging.c
@@ -22,7 +22,7 @@
 #include "lib/events/events.h"
 #include "system/filesys.h"
 #include "popt.h"
-#include "tests/cmdline.h"
+#include "cmdline.h"
 
 static int timelimit = 10;
 static int num_records = 10;

diff --git a/ctdb/tests/ctdb_test.c b/ctdb/tests/ctdb_test.c
index 8125cc44904ca497c069e4e20b1e634fb9f1ce87..dea9066eb2083bc0f4e94cf1c18520e187c6e1df 100644 (file)
--- a/ctdb/tests/ctdb_test.c
+++ b/ctdb/tests/ctdb_test.c
@@ -22,7 +22,7 @@
 #include "lib/events/events.h"
 #include "system/filesys.h"
 #include "popt.h"
-#include "tests/cmdline.h"
+#include "cmdline.h"
 
 enum my_functions {FUNC_SORT=1, FUNC_FETCH=2};
 

diff --git a/ctdb/tests/lockwait.c b/ctdb/tests/lockwait.c
index b1c699fe2c544169c73a3c5d92c6c9581a1d55f0..51f88c11685c2b85fb197a8de0173ab279b9c543 100644 (file)
--- a/ctdb/tests/lockwait.c
+++ b/ctdb/tests/lockwait.c
@@ -23,7 +23,7 @@
 #include "system/filesys.h"
 #include "system/wait.h"
 #include "popt.h"
-#include "tests/cmdline.h"
+#include "cmdline.h"
 
 
 struct lockwait_handle {