From 0312d18d44964038b5a2bb78b6504524b738c06d Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Tue, 5 May 2015 14:34:47 +0200 Subject: [PATCH] mx_getopt: rename files bee_getopt.[ch] to mx_getopt.[ch] --- .gitignore | 2 +- Makefile | 26 +++++++++++++------------- bee_getopt.c => mx_getopt.c | 2 +- bee_getopt.h => mx_getopt.h | 0 mxqd.c | 2 +- mxqdump.c | 2 +- mxqkill.c | 2 +- mxqsub.c | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) rename bee_getopt.c => mx_getopt.c (99%) rename bee_getopt.h => mx_getopt.h (100%) diff --git a/.gitignore b/.gitignore index 1c162a3a..9bd7f7a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -bee_getopt.o +mx_getopt.o mx_flock.o mx_log.o mx_util.o diff --git a/Makefile b/Makefile index 1f033890..15a7de38 100644 --- a/Makefile +++ b/Makefile @@ -201,17 +201,17 @@ mxq_job.h += mxq_group.h mxqd.h += mxqd.h -### bee_getopt.h ------------------------------------------------------ +### mx_getopt.h ------------------------------------------------------ -bee_getopt.h += bee_getopt.h +mx_getopt.h += mx_getopt.h ######################################################################## -### bee_getopt.o ------------------------------------------------------- +### mx_getopt.o ------------------------------------------------------- -bee_getopt.o: $(bee_getopt.h) +mx_getopt.o: $(mx_getopt.h) -clean: CLEAN += bee_getopt.o +clean: CLEAN += mx_getopt.o ### mx_log.o ---------------------------------------------------------- @@ -249,7 +249,7 @@ clean: CLEAN += mxq_mysql.o mxqdump.o: $(mx_log.h) mxqdump.o: $(mxq_util.h) mxqdump.o: $(mxq_mysql.h) -mxqdump.o: $(bee_getopt.h) +mxqdump.o: $(mx_getopt.h) mxqdump.o: CFLAGS += $(CFLAGS_MYSQL) mxqdump.o: CFLAGS += $(CFLAGS_MXQ_MYSQL_DEFAULT_FILE) @@ -261,7 +261,7 @@ mxqkill.o: $(mx_log.h) mxqkill.o: $(mx_util.h) mxqkill.o: $(mxq_util.h) mxqkill.o: $(mxq_mysql.h) -mxqkill.o: $(bee_getopt.h) +mxqkill.o: $(mx_getopt.h) mxqkill.o: CFLAGS += $(CFLAGS_MYSQL) mxqkill.o: CFLAGS += $(CFLAGS_MXQ_MYSQL_DEFAULT_FILE) @@ -306,7 +306,7 @@ clean: CLEAN += mxq_job.o ### mxqd.o ------------------------------------------------------------- -mxqd.o: $(bee_getopt.h) +mxqd.o: $(mx_getopt.h) mxqd.o: $(mx_flock.h) mxqd.o: $(mx_util.h) mxqd.o: $(mx_log.h) @@ -323,7 +323,7 @@ clean: CLEAN += mxqd.o ### mxqsub.o ------------------------------------------------------- -mxqsub.o: $(bee_getopt.h) +mxqsub.o: $(mx_getopt.h) mxqsub.o: $(mxq_util.h) mxqsub.o: $(mx_util.h) mxqsub.o: $(mx_log.h) @@ -341,7 +341,7 @@ mxqd: mx_flock.o mxqd: mx_util.o mxqd: mx_log.o mxqd: mxq_log.o -mxqd: bee_getopt.o +mxqd: mx_getopt.o mxqd: mxq_group.o mxqd: mxq_job.o mxqd: mxq_util.o @@ -357,7 +357,7 @@ install:: mxqd ### mxqsub ------------------------------------------------------------ -mxqsub: bee_getopt.o +mxqsub: mx_getopt.o mxqsub: mxq_mysql.o mxqsub: mxq_util.o mxqsub: mx_util.o @@ -377,7 +377,7 @@ mxqdump: mx_log.o mxqdump: mxq_group.o mxqdump: mxq_mysql.o mxqdump: mxq_util.o -mxqdump: bee_getopt.o +mxqdump: mx_getopt.o mxqdump: LDLIBS += $(LDLIBS_MYSQL) build: mxqdump @@ -395,7 +395,7 @@ mxqkill: mxq_util.o mxqkill: mx_util.o mxqkill: mxq_group.o mxqkill: mxq_job.o -mxqkill: bee_getopt.o +mxqkill: mx_getopt.o mxqkill: LDLIBS += $(LDLIBS_MYSQL) build: mxqkill diff --git a/bee_getopt.c b/mx_getopt.c similarity index 99% rename from bee_getopt.c rename to mx_getopt.c index 5231bf29..6b053bdb 100644 --- a/bee_getopt.c +++ b/mx_getopt.c @@ -43,7 +43,7 @@ #include #include -#include "bee_getopt.h" +#include "mx_getopt.h" int bee_getopt_init(struct bee_getopt_ctl *ctl, int argc, char **argv, struct bee_option *optv) { diff --git a/bee_getopt.h b/mx_getopt.h similarity index 100% rename from bee_getopt.h rename to mx_getopt.h diff --git a/mxqd.c b/mxqd.c index 0c90eb22..4f1205a2 100644 --- a/mxqd.c +++ b/mxqd.c @@ -24,7 +24,7 @@ #include #include -#include "bee_getopt.h" +#include "mx_getopt.h" #include "mx_flock.h" #include "mx_util.h" diff --git a/mxqdump.c b/mxqdump.c index fdda33c4..67e6f453 100644 --- a/mxqdump.c +++ b/mxqdump.c @@ -12,7 +12,7 @@ #include "mxq_util.h" #include "mxq_mysql.h" -#include "bee_getopt.h" +#include "mx_getopt.h" #ifndef MXQ_VERSION #define MXQ_VERSION "0.00" diff --git a/mxqkill.c b/mxqkill.c index ff76a1da..f9e92a00 100644 --- a/mxqkill.c +++ b/mxqkill.c @@ -20,7 +20,7 @@ #include "mx_util.h" #include "mxq_util.h" #include "mxq_mysql.h" -#include "bee_getopt.h" +#include "mx_getopt.h" #ifndef MXQ_VERSION #define MXQ_VERSION "0.00" diff --git a/mxqsub.c b/mxqsub.c index f857d82d..c629e41a 100644 --- a/mxqsub.c +++ b/mxqsub.c @@ -24,7 +24,7 @@ #include "mxq_mysql.h" #include "mxq_util.h" #include "mx_util.h" -#include "bee_getopt.h" +#include "mx_getopt.h" #define MXQ_TASK_JOB_FORCE_APPEND (1<<0)