Gitweb:
http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=3ee4f78d...
Commit: 3ee4f78d0039e1dc67382cfc4a2ada0ae2c1851f
Parent: 0ffe7415f206a9a874fe853b519e9f2a1d4c39e8
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Oct 4 14:23:48 2011 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Wed Oct 5 15:15:25 2011 -0500
version.cf: define RELEASE_VERSION
Signed-off-by: David Teigland <teigland(a)redhat.com>
---
.gitignore | 42 ------------------------------------------
Makefile | 15 +++++++++++++++
dlm_controld/Makefile | 2 +-
dlm_controld/dlm_daemon.h | 2 --
dlm_controld/main.c | 7 +++++--
dlm_tool/main.c | 3 ++-
include/version.cf | 6 ++++++
7 files changed, 29 insertions(+), 48 deletions(-)
diff --git a/.gitignore b/.gitignore
index 9b3b81a..e69de29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,42 +0,0 @@
-*.swp
-Makefile.in
-aclocal.m4
-autoconf
-autoheader
-autom4te.cache
-automake
-compile
-configure
-config.guess
-config.log
-config.sub
-config.status
-Makefile
-depcomp
-install-sh
-libtoolize
-ltmain.sh
-libtool
-make/stamp-h1
-m4
-make/clusterautoconfig.h*
-missing
-*.pc
-.deps
-.libs
-*.o
-*.la
-*.lo
-dlm/tests/usertest/alternate-lvb
-dlm/tests/usertest/asttest
-dlm/tests/usertest/dlmtest
-dlm/tests/usertest/dlmtest2
-dlm/tests/usertest/flood
-dlm/tests/usertest/joinleave
-dlm/tests/usertest/lstest
-dlm/tests/usertest/lvb
-dlm/tests/usertest/pingtest
-dlm/tests/usertest/threads
-dlm/tool/dlm_tool
-group/dlm_controld/dlm_controld
-group/dlm_controld/dlm_controld.pcmk
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..0b6ec6a
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,15 @@
+all:
+ make -C libdlm $@
+ make -C dlm_controld $@
+ make -C dlm_tool $@
+
+install:
+ make -C libdlm $@
+ make -C dlm_controld $@
+ make -C dlm_tool $@
+
+clean:
+ make -C libdlm $@
+ make -C dlm_controld $@
+ make -C dlm_tool $@
+
diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile
index 722d8c2..e846b05 100644
--- a/dlm_controld/Makefile
+++ b/dlm_controld/Makefile
@@ -45,7 +45,7 @@ BIN_CFLAGS += -D_GNU_SOURCE -g \
BIN_CFLAGS += -fPIE -DPIE
BIN_CFLAGS += `xml2-config --cflags`
-BIN_CFLAGS += -I../libdlm
+BIN_CFLAGS += -I../include -I../libdlm
BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie
BIN_LDFLAGS += `xml2-config --libs`
diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h
index 0c89f67..9627118 100644
--- a/dlm_controld/dlm_daemon.h
+++ b/dlm_controld/dlm_daemon.h
@@ -47,10 +47,8 @@
#define CLUSTERVARLIB "/var/lib/cluster"
#define CLUSTERVARRUN "/var/run/cluster"
#define LOGDIR "/var/log/cluster"
-#define VERSION "master"
#define SYSLOGFACILITY LOG_LOCAL4
#define SYSLOGLEVEL LOG_INFO
-#define REDHAT_COPYRIGHT "Copyright (C) Red Hat, Inc. 2004-2011 All rights
reserved."
#define LOCKFILE_NAME CLUSTERVARRUN "/dlm_controld.pid"
#define DAEMON_NAME "dlm_controld"
#define DEFAULT_LOG_MODE LOG_MODE_OUTPUT_FILE|LOG_MODE_OUTPUT_SYSLOG
diff --git a/dlm_controld/main.c b/dlm_controld/main.c
index b0d9b03..0fa10fb 100644
--- a/dlm_controld/main.c
+++ b/dlm_controld/main.c
@@ -4,6 +4,9 @@
#include <linux/genetlink.h>
#include <linux/dlm_netlink.h>
+#include "copyright.cf"
+#include "version.cf"
+
#define CLIENT_NALLOC 32
static int client_maxi;
static int client_size = 0;
@@ -1149,7 +1152,7 @@ static void read_arguments(int argc, char **argv)
case 'V':
printf("dlm_controld %s (built %s %s)\n",
- VERSION, __DATE__, __TIME__);
+ RELEASE_VERSION, __DATE__, __TIME__);
printf("%s\n", REDHAT_COPYRIGHT);
exit(EXIT_SUCCESS);
break;
@@ -1210,7 +1213,7 @@ int main(int argc, char **argv)
}
lockfile();
init_logging();
- log_level(NULL, LOG_INFO, "dlm_controld %s started", VERSION);
+ log_level(NULL, LOG_INFO, "dlm_controld %s started", RELEASE_VERSION);
signal(SIGTERM, sigterm_handler);
set_scheduler();
diff --git a/dlm_tool/main.c b/dlm_tool/main.c
index 4df930a..55593c0 100644
--- a/dlm_tool/main.c
+++ b/dlm_tool/main.c
@@ -16,6 +16,7 @@
#include "libdlm.h"
#include "libdlmcontrol.h"
#include "copyright.cf"
+#include "version.cf"
#define LKM_IVMODE -1
@@ -252,7 +253,7 @@ static void decode_arguments(int argc, char **argv)
case 'V':
printf("%s %s (built %s %s)\n",
- prog_name, VERSION, __DATE__, __TIME__);
+ prog_name, RELEASE_VERSION, __DATE__, __TIME__);
printf("%s\n", REDHAT_COPYRIGHT);
exit(EXIT_SUCCESS);
break;
diff --git a/include/version.cf b/include/version.cf
new file mode 100644
index 0000000..80e8f4a
--- /dev/null
+++ b/include/version.cf
@@ -0,0 +1,6 @@
+#ifndef _RELEASE_VERSION_CF_
+#define _RELEASE_VERSION_CF_
+
+#define RELEASE_VERSION "master"
+
+#endif