master - cleanup: set _REENTRANT in header
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=20179523e2ab0d...
Commit: 20179523e2ab0d0dce757e1a689f30ad4add3f17
Parent: 451a168bf8ce913eee5c8c055345413a067569cc
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Apr 15 20:20:46 2014 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Apr 18 16:38:50 2014 +0200
cleanup: set _REENTRANT in header
Use same way of setting _REENTRANT as in other
files - set it in the first included header file
(clvmd-common.h)
---
daemons/clvmd/Makefile.in | 1 -
daemons/clvmd/clvmd-common.h | 3 +--
2 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/daemons/clvmd/Makefile.in b/daemons/clvmd/Makefile.in
index 0da95a7..d51ea3d 100644
--- a/daemons/clvmd/Makefile.in
+++ b/daemons/clvmd/Makefile.in
@@ -87,7 +87,6 @@ include $(top_builddir)/make.tmpl
LVMLIBS += -ldevmapper
LIBS += $(PTHREAD_LIBS)
-DEFS += -D_REENTRANT
CFLAGS += -fno-strict-aliasing $(EXTRA_EXEC_CFLAGS)
LDFLAGS += $(EXTRA_EXEC_LDFLAGS)
diff --git a/daemons/clvmd/clvmd-common.h b/daemons/clvmd/clvmd-common.h
index a94edd4..3070e49 100644
--- a/daemons/clvmd/clvmd-common.h
+++ b/daemons/clvmd/clvmd-common.h
@@ -20,14 +20,13 @@
#include "configure.h"
+#define _REENTRANT
#define _GNU_SOURCE
#define _FILE_OFFSET_BITS 64
#include "libdevmapper.h"
-
#include "lvm-logging.h"
#include <unistd.h>
-#include <sys/stat.h>
#endif
10 years
master - cleanup: drop inclusion of devmap - merge
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=451a168bf8ce91...
Commit: 451a168bf8ce913eee5c8c055345413a067569cc
Parent: 559c003ee248704e758dec63cf480447d4de6cd7
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Apr 17 12:57:28 2014 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Apr 18 16:38:50 2014 +0200
cleanup: drop inclusion of devmap - merge
---
daemons/dmeventd/plugins/lvm2/dmeventd_lvm.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/daemons/dmeventd/plugins/lvm2/dmeventd_lvm.h b/daemons/dmeventd/plugins/lvm2/dmeventd_lvm.h
index 1960c71..5691c87 100644
--- a/daemons/dmeventd/plugins/lvm2/dmeventd_lvm.h
+++ b/daemons/dmeventd/plugins/lvm2/dmeventd_lvm.h
@@ -22,11 +22,11 @@
* liblvm2cmd thread-safe so this can go away.
*/
-#include "libdevmapper.h"
-
#ifndef _DMEVENTD_LVMWRAP_H
#define _DMEVENTD_LVMWRAP_H
+struct dm_pool;
+
int dmeventd_lvm2_init(void);
void dmeventd_lvm2_exit(void);
int dmeventd_lvm2_run(const char *cmdline);
10 years
master - cleanup: reduce inclusion of unnecessary headers
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=559c003ee24870...
Commit: 559c003ee248704e758dec63cf480447d4de6cd7
Parent: 589983a257cd2f92489f41d2d7ec62784bf357e7
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Apr 17 10:48:55 2014 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Apr 18 16:38:50 2014 +0200
cleanup: reduce inclusion of unnecessary headers
Remove those file which are not needed by .c files
or already include because the headers already needs them.
---
lib/commands/toolcontext.h | 1 -
lib/config/config.h | 3 +--
lib/config/config_settings.h | 1 +
lib/datastruct/lvm-types.h | 3 ---
lib/format_text/import-export.h | 1 -
lib/mirror/mirrored.c | 1 -
lib/misc/lib.h | 5 -----
lib/misc/lvm-string.h | 6 +++---
lib/raid/raid.c | 2 --
lib/report/properties.c | 1 -
lib/snapshot/snapshot.c | 2 --
lib/thin/thin.c | 6 ------
lib/unknown/unknown.c | 2 --
lib/zero/zero.c | 1 -
14 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h
index 0cd9a2f..7694ee2 100644
--- a/lib/commands/toolcontext.h
+++ b/lib/commands/toolcontext.h
@@ -19,7 +19,6 @@
#include "dev-cache.h"
#include "dev-type.h"
-#include <stdio.h>
#include <limits.h>
/*
diff --git a/lib/config/config.h b/lib/config/config.h
index a61d285..b258d55 100644
--- a/lib/config/config.h
+++ b/lib/config/config.h
@@ -16,8 +16,7 @@
#ifndef _LVM_CONFIG_H
#define _LVM_CONFIG_H
-#include "lvm-types.h"
-#include "defaults.h"
+#include "libdevmapper.h"
/* 16 bits: 3 bits for major, 4 bits for minor, 9 bits for patchlevel */
/* FIXME Max LVM version supported: 7.15.511. Extend bits when needed. */
diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
index 932ba2e..3792238 100644
--- a/lib/config/config_settings.h
+++ b/lib/config/config_settings.h
@@ -65,6 +65,7 @@
* that parent nodes are consistent with versioning, no check done
* if parent node is older or the same age as any child node!)
*/
+#include "defaults.h"
cfg_section(root_CFG_SECTION, "(root)", root_CFG_SECTION, 0, vsn(0, 0, 0), NULL)
diff --git a/lib/datastruct/lvm-types.h b/lib/datastruct/lvm-types.h
index de144bd..b38798f 100644
--- a/lib/datastruct/lvm-types.h
+++ b/lib/datastruct/lvm-types.h
@@ -16,9 +16,6 @@
#ifndef _LVM_TYPES_H
#define _LVM_TYPES_H
-#include <sys/types.h>
-#include <inttypes.h>
-
#include "libdevmapper.h"
struct str_list {
diff --git a/lib/format_text/import-export.h b/lib/format_text/import-export.h
index 6a4afed..d4e25f0 100644
--- a/lib/format_text/import-export.h
+++ b/lib/format_text/import-export.h
@@ -17,7 +17,6 @@
#define _LVM_TEXT_IMPORT_EXPORT_H
#include "config.h"
-#include "lvm-types.h"
#include "metadata.h"
#include <stdio.h>
diff --git a/lib/mirror/mirrored.c b/lib/mirror/mirrored.c
index e35a372..afb047e 100644
--- a/lib/mirror/mirrored.c
+++ b/lib/mirror/mirrored.c
@@ -21,7 +21,6 @@
#include "text_export.h"
#include "text_import.h"
#include "config.h"
-#include "defaults.h"
#include "lvm-string.h"
#include "targets.h"
#include "activate.h"
diff --git a/lib/misc/lib.h b/lib/misc/lib.h
index f0dba25..5bd968a 100644
--- a/lib/misc/lib.h
+++ b/lib/misc/lib.h
@@ -43,11 +43,6 @@
# include "lvm-types.h"
#endif
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <unistd.h>
-#include <sys/stat.h>
#endif
diff --git a/lib/misc/lvm-string.h b/lib/misc/lvm-string.h
index 82ebb12..a4f112f 100644
--- a/lib/misc/lvm-string.h
+++ b/lib/misc/lvm-string.h
@@ -16,12 +16,12 @@
#ifndef _LVM_STRING_H
#define _LVM_STRING_H
-#include <stdio.h>
-#include <stdarg.h>
-
#define NAME_LEN 128
#define UUID_PREFIX "LVM-"
+#include <sys/types.h>
+
+struct dm_pool;
struct pool;
struct logical_volume;
diff --git a/lib/raid/raid.c b/lib/raid/raid.c
index 0869ff4..815c6f7 100644
--- a/lib/raid/raid.c
+++ b/lib/raid/raid.c
@@ -13,7 +13,6 @@
*/
#include "lib.h"
-#include "toolcontext.h"
#include "segtype.h"
#include "display.h"
#include "text_export.h"
@@ -25,7 +24,6 @@
#include "activate.h"
#include "metadata.h"
#include "lv_alloc.h"
-#include "defaults.h"
static const char *_raid_name(const struct lv_segment *seg)
{
diff --git a/lib/report/properties.c b/lib/report/properties.c
index 8c48de1..c6ccb72 100644
--- a/lib/report/properties.c
+++ b/lib/report/properties.c
@@ -15,7 +15,6 @@
#include "lib.h"
#include "properties.h"
#include "activate.h"
-#include "lvm-types.h"
#include "metadata.h"
diff --git a/lib/snapshot/snapshot.c b/lib/snapshot/snapshot.c
index 64919b0..7ee0365 100644
--- a/lib/snapshot/snapshot.c
+++ b/lib/snapshot/snapshot.c
@@ -14,14 +14,12 @@
*/
#include "lib.h"
-#include "toolcontext.h"
#include "metadata.h"
#include "segtype.h"
#include "text_export.h"
#include "config.h"
#include "activate.h"
#include "str_list.h"
-#include "defaults.h"
#define SEG_LOG_ERROR(t, p...) \
log_error(t " segment %s of logical volume %s.", ## p, \
diff --git a/lib/thin/thin.c b/lib/thin/thin.c
index d4bde8b..b717603 100644
--- a/lib/thin/thin.c
+++ b/lib/thin/thin.c
@@ -13,18 +13,12 @@
*/
#include "lib.h"
-#include "toolcontext.h"
#include "metadata.h"
#include "segtype.h"
#include "text_export.h"
#include "config.h"
#include "activate.h"
#include "str_list.h"
-#include "defaults.h"
-
-#ifdef DMEVENTD
-# include "libdevmapper-event.h"
-#endif
/* Dm kernel module name for thin provisiong */
static const char _thin_pool_module[] = "thin-pool";
diff --git a/lib/unknown/unknown.c b/lib/unknown/unknown.c
index 848a369..9e433cf 100644
--- a/lib/unknown/unknown.c
+++ b/lib/unknown/unknown.c
@@ -15,10 +15,8 @@
#include "lib.h"
#include "toolcontext.h"
#include "segtype.h"
-#include "display.h"
#include "text_export.h"
#include "config.h"
-#include "activate.h"
static const char *_unknown_name(const struct lv_segment *seg)
{
diff --git a/lib/zero/zero.c b/lib/zero/zero.c
index 473daa0..555c570 100644
--- a/lib/zero/zero.c
+++ b/lib/zero/zero.c
@@ -13,7 +13,6 @@
*/
#include "lib.h"
-#include "toolcontext.h"
#include "segtype.h"
#include "display.h"
#include "config.h"
10 years
master - cleanup: include stdarg.h where needed.
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=589983a257cd2f...
Commit: 589983a257cd2f92489f41d2d7ec62784bf357e7
Parent: b7741f0a831ef9dfd4fda19abba6ca8e91baa378
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Apr 15 13:27:47 2014 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Apr 18 16:38:50 2014 +0200
cleanup: include stdarg.h where needed.
Avoid dependency on implicit inclusion of stdarg.h with
libdevmapper.h.
---
daemons/clvmd/clvmd.c | 9 +++++----
daemons/dmeventd/dmeventd.c | 1 +
.../dmeventd/plugins/snapshot/dmeventd_snapshot.c | 1 +
daemons/dmeventd/plugins/thin/dmeventd_thin.c | 1 +
lib/display/display.c | 1 +
lib/misc/lvm-string.c | 1 +
libdm/libdm-config.c | 1 +
libdm/libdm-string.c | 1 +
8 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c
index 3e92490..9b865f6 100644
--- a/daemons/clvmd/clvmd.c
+++ b/daemons/clvmd/clvmd.c
@@ -19,10 +19,6 @@
#include "clvmd-common.h"
-#include <pthread.h>
-#include <getopt.h>
-#include <ctype.h>
-
#include "clvmd-comms.h"
#include "clvm.h"
#include "clvmd.h"
@@ -34,6 +30,11 @@
#include <corosync/confdb.h>
#endif
+#include <pthread.h>
+#include <getopt.h>
+#include <ctype.h>
+#include <stdarg.h>
+
#include <fcntl.h>
#include <netinet/in.h>
#include <signal.h>
diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c
index 906f731..32610ec 100644
--- a/daemons/dmeventd/dmeventd.c
+++ b/daemons/dmeventd/dmeventd.c
@@ -26,6 +26,7 @@
//#include "libmultilog.h"
#include "dm-logging.h"
+#include <stdarg.h>
#include <dlfcn.h>
#include <errno.h>
#include <pthread.h>
diff --git a/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c b/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c
index c4b69e2..bbee93a 100644
--- a/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c
+++ b/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c
@@ -20,6 +20,7 @@
#include <sys/wait.h>
#include <syslog.h> /* FIXME Replace syslog with multilog */
+#include <stdarg.h>
/* FIXME Missing openlog? */
/* First warning when snapshot is 80% full. */
diff --git a/daemons/dmeventd/plugins/thin/dmeventd_thin.c b/daemons/dmeventd/plugins/thin/dmeventd_thin.c
index b700b8d..f0d3f24 100644
--- a/daemons/dmeventd/plugins/thin/dmeventd_thin.c
+++ b/daemons/dmeventd/plugins/thin/dmeventd_thin.c
@@ -20,6 +20,7 @@
#include <sys/wait.h>
#include <syslog.h> /* FIXME Replace syslog with multilog */
+#include <stdarg.h>
/* FIXME Missing openlog? */
/* First warning when thin is 80% full. */
diff --git a/lib/display/display.c b/lib/display/display.c
index 3bcf439..b7fbf1a 100644
--- a/lib/display/display.c
+++ b/lib/display/display.c
@@ -22,6 +22,7 @@
#include "defaults.h"
#include <math.h> /* fabs() */
#include <float.h> /* DBL_EPSILON */
+#include <stdarg.h>
#define SIZE_BUF 128
diff --git a/lib/misc/lvm-string.c b/lib/misc/lvm-string.c
index 5377528..cdee02b 100644
--- a/lib/misc/lvm-string.c
+++ b/lib/misc/lvm-string.c
@@ -18,6 +18,7 @@
#include "metadata-exported.h"
#include <ctype.h>
+#include <stdarg.h>
int emit_to_buffer(char **buffer, size_t *size, const char *fmt, ...)
{
diff --git a/libdm/libdm-config.c b/libdm/libdm-config.c
index ea1af2f..f8d6b1b 100644
--- a/libdm/libdm-config.c
+++ b/libdm/libdm-config.c
@@ -20,6 +20,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <ctype.h>
+#include <stdarg.h>
#define SECTION_B_CHAR '{'
#define SECTION_E_CHAR '}'
diff --git a/libdm/libdm-string.c b/libdm/libdm-string.c
index 9d667bb..64a9792 100644
--- a/libdm/libdm-string.c
+++ b/libdm/libdm-string.c
@@ -15,6 +15,7 @@
#include "dmlib.h"
#include <ctype.h>
+#include <stdarg.h>
/*
* consume characters while they match the predicate function.
10 years
master - libdaemon: header cleanup
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b7741f0a831ef9...
Commit: b7741f0a831ef9dfd4fda19abba6ca8e91baa378
Parent: e552824dc046b90f201de8041730f2dbf6969aa0
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Apr 17 10:40:35 2014 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Apr 18 16:38:49 2014 +0200
libdaemon: header cleanup
Ensure daemon-io.h is used as a generic header included
with configure defines before other headers.
(In future all lvm2 libraries should settle on a single lib.h header)
Rename couple defines to better match header file names.
---
libdaemon/client/config-util.c | 7 +++----
libdaemon/client/config-util.h | 3 +--
libdaemon/client/daemon-client.c | 2 --
libdaemon/client/daemon-client.h | 4 ++--
libdaemon/client/daemon-io.c | 6 +++---
libdaemon/client/daemon-io.h | 6 +++---
libdaemon/server/daemon-server.c | 1 -
libdaemon/server/daemon-server.h | 4 ++--
8 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/libdaemon/client/config-util.c b/libdaemon/client/config-util.c
index d40e94c..e5f4e22 100644
--- a/libdaemon/client/config-util.c
+++ b/libdaemon/client/config-util.c
@@ -12,15 +12,14 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "daemon-io.h"
+#include "dm-logging.h"
+
#include <errno.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
-#include "dm-logging.h"
-#include "config-util.h"
-#include "libdevmapper.h"
-
int buffer_append_vf(struct buffer *buf, va_list ap)
{
char *append;
diff --git a/libdaemon/client/config-util.h b/libdaemon/client/config-util.h
index f03bcab..47fab6b 100644
--- a/libdaemon/client/config-util.h
+++ b/libdaemon/client/config-util.h
@@ -15,7 +15,6 @@
#ifndef _LVM_DAEMON_CONFIG_UTIL_H
#define _LVM_DAEMON_CONFIG_UTIL_H
-#include "configure.h"
#include "libdevmapper.h"
#include <stdarg.h>
@@ -64,4 +63,4 @@ struct dm_config_node *config_make_nodes(struct dm_config_tree *cft,
struct dm_config_node *pre_sib,
...);
-#endif /* _LVM_DAEMON_SHARED_H */
+#endif /* _LVM_DAEMON_CONFIG_UTIL_H */
diff --git a/libdaemon/client/daemon-client.c b/libdaemon/client/daemon-client.c
index a821cf3..a11b604 100644
--- a/libdaemon/client/daemon-client.c
+++ b/libdaemon/client/daemon-client.c
@@ -13,7 +13,6 @@
*/
#include "daemon-io.h"
-#include "config-util.h"
#include "daemon-client.h"
#include "dm-logging.h"
@@ -208,4 +207,3 @@ void daemon_request_destroy(daemon_request r) {
dm_config_destroy(r.cft);
buffer_destroy(&r.buffer);
}
-
diff --git a/libdaemon/client/daemon-client.h b/libdaemon/client/daemon-client.h
index 8a44f8b..ae3be91 100644
--- a/libdaemon/client/daemon-client.h
+++ b/libdaemon/client/daemon-client.h
@@ -12,8 +12,8 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _LVM_DAEMON_COMMON_CLIENT_H
-#define _LVM_DAEMON_COMMON_CLIENT_H
+#ifndef _LVM_DAEMON_CLIENT_H
+#define _LVM_DAEMON_CLIENT_H
#include "libdevmapper.h"
#include "config-util.h"
diff --git a/libdaemon/client/daemon-io.c b/libdaemon/client/daemon-io.c
index e2c5180..6d81ed8 100644
--- a/libdaemon/client/daemon-io.c
+++ b/libdaemon/client/daemon-io.c
@@ -12,14 +12,14 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "daemon-io.h"
+#include "libdevmapper.h"
+
#include <errno.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
-#include "daemon-io.h"
-#include "libdevmapper.h"
-
/*
* Read a single message from a (socket) filedescriptor. Messages are delimited
* by blank lines. This call will block until all of a message is received. The
diff --git a/libdaemon/client/daemon-io.h b/libdaemon/client/daemon-io.h
index 52aaa9c..b48acca 100644
--- a/libdaemon/client/daemon-io.h
+++ b/libdaemon/client/daemon-io.h
@@ -16,16 +16,16 @@
#define _LVM_DAEMON_IO_H
#include "configure.h"
-#include "config-util.h"
-#include "libdevmapper.h"
#define _REENTRANT
#define _GNU_SOURCE
#define _FILE_OFFSET_BITS 64
+#include "config-util.h"
+
/* TODO function names */
int buffer_read(int fd, struct buffer *buffer);
int buffer_write(int fd, const struct buffer *buffer);
-#endif /* _LVM_DAEMON_SHARED_H */
+#endif /* _LVM_DAEMON_IO_H */
diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c
index 914b803..919f7df 100644
--- a/libdaemon/server/daemon-server.c
+++ b/libdaemon/server/daemon-server.c
@@ -11,7 +11,6 @@
*/
#include "daemon-io.h"
-#include "config-util.h"
#include "daemon-server.h"
#include "daemon-log.h"
diff --git a/libdaemon/server/daemon-server.h b/libdaemon/server/daemon-server.h
index eb6df43..ad41372 100644
--- a/libdaemon/server/daemon-server.h
+++ b/libdaemon/server/daemon-server.h
@@ -12,8 +12,8 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _LVM_DAEMON_COMMON_SERVER_H
-#define _LVM_DAEMON_COMMON_SERVER_H
+#ifndef _LVM_DAEMON_SERVER_H
+#define _LVM_DAEMON_SERVER_H
#include "daemon-client.h"
10 years
master - makefiles: move subdir into same section
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e552824dc046b9...
Commit: e552824dc046b90f201de8041730f2dbf6969aa0
Parent: 07274f3dd4bd0aafb5dbf501906534c0668b1802
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed Apr 16 11:57:42 2014 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Apr 18 16:38:49 2014 +0200
makefiles: move subdir into same section
Just shift few lines
---
daemons/Makefile.in | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/daemons/Makefile.in b/daemons/Makefile.in
index c83e0da..9a73516 100644
--- a/daemons/Makefile.in
+++ b/daemons/Makefile.in
@@ -15,10 +15,6 @@ srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
-ifeq ("@BUILD_LVMETAD@", "yes")
- SUBDIRS += lvmetad
-endif
-
.PHONY: dmeventd clvmd cmirrord lvmetad
ifneq ("@CLVMD@", "none")
@@ -36,6 +32,10 @@ daemons.cflow: dmeventd.cflow
endif
endif
+ifeq ("@BUILD_LVMETAD@", "yes")
+ SUBDIRS += lvmetad
+endif
+
ifeq ($(MAKECMDGOALS),distclean)
SUBDIRS = clvmd cmirrord dmeventd lvmetad
endif
10 years
master - makefiles: drop linking of deamon libs to plugins
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=07274f3dd4bd0a...
Commit: 07274f3dd4bd0aafb5dbf501906534c0668b1802
Parent: 2b748e3118988222560392fa795e093cd2ce0af4
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Apr 17 14:12:02 2014 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Apr 18 16:38:49 2014 +0200
makefiles: drop linking of deamon libs to plugins
Daemon lib is linked into lvm2cmd library.
---
daemons/dmeventd/plugins/lvm2/Makefile.in | 4 ++--
daemons/dmeventd/plugins/mirror/Makefile.in | 8 ++++----
daemons/dmeventd/plugins/raid/Makefile.in | 6 +++---
daemons/dmeventd/plugins/snapshot/Makefile.in | 8 ++++----
daemons/dmeventd/plugins/thin/Makefile.in | 6 +++---
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/daemons/dmeventd/plugins/lvm2/Makefile.in b/daemons/dmeventd/plugins/lvm2/Makefile.in
index fcb2a0a..a7b9a2e 100644
--- a/daemons/dmeventd/plugins/lvm2/Makefile.in
+++ b/daemons/dmeventd/plugins/lvm2/Makefile.in
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2010-2011 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2010-2014 Red Hat, Inc. All rights reserved.
#
# This file is part of LVM2.
#
@@ -24,7 +24,7 @@ LIB_VERSION = $(LIB_VERSION_LVM)
include $(top_builddir)/make.tmpl
-LIBS += @LVM2CMD_LIB@ -ldevmapper $(PTHREAD_LIBS) $(DAEMON_LIBS)
+LIBS += @LVM2CMD_LIB@ -ldevmapper $(PTHREAD_LIBS)
install_lvm2: install_lib_shared
diff --git a/daemons/dmeventd/plugins/mirror/Makefile.in b/daemons/dmeventd/plugins/mirror/Makefile.in
index 85b33c9..4a2870a 100644
--- a/daemons/dmeventd/plugins/mirror/Makefile.in
+++ b/daemons/dmeventd/plugins/mirror/Makefile.in
@@ -1,6 +1,6 @@
#
# Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004-2005, 2008-2011 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2004-2005, 2008-2014 Red Hat, Inc. All rights reserved.
#
# This file is part of LVM2.
#
@@ -16,8 +16,8 @@ srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
-INCLUDES += -I$(top_srcdir)/tools -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2
-CLDFLAGS += -L$(top_builddir)/tools -L$(top_builddir)/daemons/dmeventd/plugins/lvm2
+INCLUDES += -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2
+CLDFLAGS += -L$(top_builddir)/daemons/dmeventd/plugins/lvm2
SOURCES = dmeventd_mirror.c
@@ -30,7 +30,7 @@ CFLOW_LIST_TARGET = $(LIB_NAME).cflow
include $(top_builddir)/make.tmpl
-LIBS += -ldevmapper-event-lvm2 -ldevmapper $(DAEMON_LIBS)
+LIBS += -ldevmapper-event-lvm2 -ldevmapper
install_lvm2: install_dm_plugin
diff --git a/daemons/dmeventd/plugins/raid/Makefile.in b/daemons/dmeventd/plugins/raid/Makefile.in
index a6b7788..47582ae 100644
--- a/daemons/dmeventd/plugins/raid/Makefile.in
+++ b/daemons/dmeventd/plugins/raid/Makefile.in
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2011 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2011-2014 Red Hat, Inc. All rights reserved.
#
# This file is part of LVM2.
#
@@ -15,8 +15,8 @@ srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
-INCLUDES += -I$(top_srcdir)/tools -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2
-CLDFLAGS += -L$(top_builddir)/tools -L$(top_builddir)/daemons/dmeventd/plugins/lvm2
+INCLUDES += -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2
+CLDFLAGS += -L$(top_builddir)/daemons/dmeventd/plugins/lvm2
SOURCES = dmeventd_raid.c
diff --git a/daemons/dmeventd/plugins/snapshot/Makefile.in b/daemons/dmeventd/plugins/snapshot/Makefile.in
index a4cff15..b766f16 100644
--- a/daemons/dmeventd/plugins/snapshot/Makefile.in
+++ b/daemons/dmeventd/plugins/snapshot/Makefile.in
@@ -1,6 +1,6 @@
#
# Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2004-2014 Red Hat, Inc. All rights reserved.
#
# This file is part of the LVM2.
#
@@ -16,8 +16,8 @@ srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
-INCLUDES += -I$(top_srcdir)/tools -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2
-CLDFLAGS += -L$(top_builddir)/tools -L$(top_builddir)/daemons/dmeventd/plugins/lvm2
+INCLUDES += -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2
+CLDFLAGS += -L$(top_builddir)/daemons/dmeventd/plugins/lvm2
SOURCES = dmeventd_snapshot.c
@@ -26,7 +26,7 @@ LIB_VERSION = $(LIB_VERSION_LVM)
include $(top_builddir)/make.tmpl
-LIBS += -ldevmapper-event-lvm2 -ldevmapper $(DAEMON_LIBS)
+LIBS += -ldevmapper-event-lvm2 -ldevmapper
install_lvm2: install_dm_plugin
diff --git a/daemons/dmeventd/plugins/thin/Makefile.in b/daemons/dmeventd/plugins/thin/Makefile.in
index e964ab5..cfd473a 100644
--- a/daemons/dmeventd/plugins/thin/Makefile.in
+++ b/daemons/dmeventd/plugins/thin/Makefile.in
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2011 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2011-2014 Red Hat, Inc. All rights reserved.
#
# This file is part of LVM2.
#
@@ -15,8 +15,8 @@ srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
-INCLUDES += -I$(top_srcdir)/tools -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2
-CLDFLAGS += -L$(top_builddir)/tools -L$(top_builddir)/daemons/dmeventd/plugins/lvm2
+INCLUDES += -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2
+CLDFLAGS += -L$(top_builddir)/daemons/dmeventd/plugins/lvm2
SOURCES = dmeventd_thin.c
10 years
master - makefiles: compile files on make
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2b748e31189882...
Commit: 2b748e3118988222560392fa795e093cd2ce0af4
Parent: 1af05a7a166a470d1b9d86f88fdc64c2d984124b
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Apr 17 10:07:17 2014 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Apr 18 16:38:49 2014 +0200
makefiles: compile files on make
Make install should install already compiled/generated files.
---
udev/Makefile.in | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/udev/Makefile.in b/udev/Makefile.in
index a2e2571..390069b 100644
--- a/udev/Makefile.in
+++ b/udev/Makefile.in
@@ -58,6 +58,8 @@ endif
%_install: %.rules
$(INSTALL_DATA) -D $< $(udevdir)/$(<F)
+all: $(DM_RULES) $(LVM_RULES)
+CLEAN_TARGETS = $(DM_RULES) $(LVM_RULES)
install_device-mapper: $(DM_RULES:.rules=_install)
install_lvm2: $(LVM_RULES:.rules=_install)
10 years
master - makefiles: clear targets in with make clean
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=1af05a7a166a47...
Commit: 1af05a7a166a470d1b9d86f88fdc64c2d984124b
Parent: 4955dae4be6ca42f3428ca4f71ba86c3d0fb89b4
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Apr 17 10:01:05 2014 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Apr 18 16:38:48 2014 +0200
makefiles: clear targets in with make clean
Make clean usually cleans all compiled files.
Make distclean cleans configure generated files
---
scripts/Makefile.in | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 8fdb5f7..ed77900 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -29,6 +29,7 @@ ifeq ("@APPLIB@", "yes")
endif
ifeq ("@DMEVENTD@", "yes")
+ DEPLIBS += $(top_builddir)/daemons/dmeventd/libdevmapper-event.so
LVMLIBS += -ldevmapper-event
endif
@@ -124,15 +125,22 @@ install_tmpfiles_configuration:
$(INSTALL_DIR) $(tmpfiles_dir)
$(INSTALL_DATA) lvm2_tmpfiles_red_hat.conf $(tmpfiles_dir)/lvm2.conf
-DISTCLEAN_TARGETS += clvmd_init_red_hat cmirrord_init_red_hat \
- lvm2_monitoring_init_red_hat lvm2_lvmetad_init_red_hat \
- dm_event_systemd_red_hat.socket dm_event_systemd_red_hat.service \
- lvm2_monitoring_systemd_red_hat.service \
- lvm2_lvmetad_systemd_red_hat.socket lvm2_lvmetad_systemd_red_hat.service \
- lvm2_pvscan_systemd_red_hat@.service \
- lvm2_tmpfiles_red_hat.conf blk_availability_init_red_hat \
- blk_availability_systemd_red_hat.service \
- blkdeactivate.sh lvm2_clvmd_systemd_red_hat.service \
- lvm2_cmirrord_systemd_red_hat.service \
- lvm2_cluster_activation_systemd_red_hat.service \
- lvm2_cluster_activation_red_hat.sh
+CLEAN_TARGETS += \
+ blkdeactivate.sh \
+ blk_availability_init_red_hat \
+ blk_availability_systemd_red_hat.service \
+ clvmd_init_red_hat \
+ cmirrord_init_red_hat \
+ dm_event_systemd_red_hat.service \
+ dm_event_systemd_red_hat.socket \
+ lvm2_cluster_activation_red_hat.sh \
+ lvm2_cluster_activation_systemd_red_hat.service \
+ lvm2_clvmd_systemd_red_hat.service \
+ lvm2_cmirrord_systemd_red_hat.service \
+ lvm2_lvmetad_init_red_hat \
+ lvm2_lvmetad_systemd_red_hat.service \
+ lvm2_lvmetad_systemd_red_hat.socket \
+ lvm2_monitoring_init_red_hat \
+ lvm2_monitoring_systemd_red_hat.service \
+ lvm2_pvscan_systemd_red_hat@.service \
+ lvm2_tmpfiles_red_hat.conf
10 years
master - makefiles: wait till include is populated
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=4955dae4be6ca4...
Commit: 4955dae4be6ca42f3428ca4f71ba86c3d0fb89b4
Parent: db0045dfc9403f1276682831ecbd4b83e2f72ebc
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed Apr 16 11:58:32 2014 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Apr 18 16:38:48 2014 +0200
makefiles: wait till include is populated
Since libdaemon needs configure.h header, wait forl links.
---
Makefile.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index d248a0e..641b833 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -51,6 +51,7 @@ DISTCLEAN_TARGETS += config.cache config.log config.status make.tmpl
include make.tmpl
libdm: include
+libdaemon: include
lib: libdm libdaemon
liblvm: lib
daemons: lib libdaemon tools
10 years