public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
* LVM2 ./WHATS_NEW ./make.tmpl.in daemons/clvmd/ ...
@ 2010-03-04 11:12 zkabelac
0 siblings, 0 replies; 4+ messages in thread
From: zkabelac @ 2010-03-04 11:12 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: zkabelac@sourceware.org 2010-03-04 11:12:40
Modified files:
. : WHATS_NEW make.tmpl.in
daemons/clvmd : Makefile.in
liblvm : Makefile.in
tools : Makefile.in
Log message:
Introduce LVMINTERNAL_LIBS
Keep dependency libraries for liblvm-internal in one place.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1448&r2=1.1449
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/make.tmpl.in.diff?cvsroot=lvm2&r1=1.77&r2=1.78
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/Makefile.in.diff?cvsroot=lvm2&r1=1.33&r2=1.34
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/liblvm/Makefile.in.diff?cvsroot=lvm2&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/Makefile.in.diff?cvsroot=lvm2&r1=1.105&r2=1.106
--- LVM2/WHATS_NEW 2010/03/04 11:09:08 1.1448
+++ LVM2/WHATS_NEW 2010/03/04 11:12:39 1.1449
@@ -1,5 +1,6 @@
Version 2.02.62 -
====================================
+ Define and use internal makefile variable LVMINTERNAL_LIBS.
Help for configure prints --disable-fsadm.
Use consistently $() instead of ${} for all Makefile variables.
Replace CFLOW_CMD only in make.tmpl and use it as variable elsewhere.
--- LVM2/make.tmpl.in 2010/03/04 09:53:08 1.77
+++ LVM2/make.tmpl.in 2010/03/04 11:12:39 1.78
@@ -36,6 +36,7 @@
LDDEPS += @LDDEPS@
LDFLAGS += @LDFLAGS@
LIB_SUFFIX = @LIB_SUFFIX@
+LVMINTERNAL_LIBS = -llvm-internal
# Setup directory variables
prefix = @prefix@
--- LVM2/daemons/clvmd/Makefile.in 2010/03/04 09:51:37 1.33
+++ LVM2/daemons/clvmd/Makefile.in 2010/03/04 11:12:39 1.34
@@ -75,7 +75,7 @@
TARGETS = \
clvmd
-LVMLIBS = -llvm-internal -lpthread
+LVMLIBS = $(LVMINTERNAL_LIBS) -lpthread
ifeq ("@DMEVENTD@", "yes")
LVMLIBS += -ldevmapper-event
--- LVM2/liblvm/Makefile.in 2010/03/04 09:51:40 1.19
+++ LVM2/liblvm/Makefile.in 2010/03/04 11:12:40 1.20
@@ -42,7 +42,7 @@
include $(top_builddir)/make.tmpl
-LIBS += -ldevmapper -llvm-internal
+LIBS += $(LVMINTERNAL_LIBS) -ldevmapper
ifeq ("@DMEVENTD@", "yes")
LIBS += -ldevmapper-event
--- LVM2/tools/Makefile.in 2010/03/04 09:53:08 1.105
+++ LVM2/tools/Makefile.in 2010/03/04 11:12:40 1.106
@@ -86,7 +86,7 @@
INSTALL_CMDLIB_TARGETS += install_cmdlib_static
endif
-LVMLIBS = -llvm-internal
+LVMLIBS = $(LVMINTERNAL_LIBS)
LIB_VERSION = $(LIB_VERSION_LVM)
CLEAN_TARGETS = liblvm2cmd.$(LIB_SUFFIX) liblvm2cmd.a liblvm2cmd-static.a lvm lvm.o \
^ permalink raw reply [flat|nested] 4+ messages in thread
* LVM2 ./WHATS_NEW ./make.tmpl.in daemons/clvmd/ ...
@ 2007-04-27 17:46 agk
0 siblings, 0 replies; 4+ messages in thread
From: agk @ 2007-04-27 17:46 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: agk@sourceware.org 2007-04-27 18:46:16
Modified files:
. : WHATS_NEW make.tmpl.in
daemons/clvmd : clvmd-cman.c clvmd-command.c clvmd-gulm.c
clvmd.c lvm-functions.c system-lv.c tcp-comms.c
dmeventd/mirror: dmeventd_mirror.c
lib/activate : activate.c
lib/misc : lib.h
Log message:
Change some #include lines to search only standard system directories.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.607&r2=1.608
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/make.tmpl.in.diff?cvsroot=lvm2&r1=1.47&r2=1.48
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd-cman.c.diff?cvsroot=lvm2&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd-command.c.diff?cvsroot=lvm2&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd-gulm.c.diff?cvsroot=lvm2&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd.c.diff?cvsroot=lvm2&r1=1.34&r2=1.35
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/lvm-functions.c.diff?cvsroot=lvm2&r1=1.29&r2=1.30
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/system-lv.c.diff?cvsroot=lvm2&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/tcp-comms.c.diff?cvsroot=lvm2&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/dmeventd/mirror/dmeventd_mirror.c.diff?cvsroot=lvm2&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/activate/activate.c.diff?cvsroot=lvm2&r1=1.121&r2=1.122
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/misc/lib.h.diff?cvsroot=lvm2&r1=1.10&r2=1.11
--- LVM2/WHATS_NEW 2007/04/26 16:44:57 1.607
+++ LVM2/WHATS_NEW 2007/04/27 17:46:15 1.608
@@ -1,5 +1,6 @@
Version 2.02.25 -
=================================
+ Change some #include lines to search only standard system directories.
Add devices/preferred_names config regex list for displayed device names.
Free a temporary dir string in fcntl_lock_file() after use.
Fix a dm_pool_destroy() in matcher_create().
--- LVM2/make.tmpl.in 2007/01/11 17:12:26 1.47
+++ LVM2/make.tmpl.in 2007/04/27 17:46:15 1.48
@@ -94,7 +94,7 @@
LIB_VERSION := $(shell cat $(top_srcdir)/VERSION | \
awk -F '.' '{printf "%s.%s",$$1,$$2}')
-INCLUDES += -I. -I$(top_srcdir)/include
+INCLUDES += -I$(top_srcdir)/include
ifneq ("@DMDIR@", "")
INCLUDES += -I@DMDIR@/include
--- LVM2/daemons/clvmd/clvmd-cman.c 2007/04/23 14:55:28 1.17
+++ LVM2/daemons/clvmd/clvmd-cman.c 2007/04/27 17:46:16 1.18
@@ -36,10 +36,10 @@
#include <fcntl.h>
#include <getopt.h>
#include <errno.h>
+#include <libdlm.h>
#include "clvmd-comms.h"
#include "clvm.h"
-#include "libdlm.h"
#include "log.h"
#include "clvmd.h"
#include "lvm-functions.h"
--- LVM2/daemons/clvmd/clvmd-command.c 2006/12/11 14:00:26 1.14
+++ LVM2/daemons/clvmd/clvmd-command.c 2007/04/27 17:46:16 1.15
@@ -64,8 +64,9 @@
#include <stddef.h>
#include <unistd.h>
#include <errno.h>
+#include <libdevmapper.h>
+#include <libdlm.h>
-#include "libdevmapper.h"
#include "list.h"
#include "locking.h"
#include "log.h"
@@ -73,7 +74,6 @@
#include "clvmd-comms.h"
#include "clvm.h"
#include "clvmd.h"
-#include "libdlm.h"
extern struct cluster_ops *clops;
--- LVM2/daemons/clvmd/clvmd-gulm.c 2006/12/11 14:00:26 1.20
+++ LVM2/daemons/clvmd/clvmd-gulm.c 2007/04/27 17:46:16 1.21
@@ -40,9 +40,10 @@
#include <utmpx.h>
#include <syslog.h>
#include <assert.h>
+#include <libdevmapper.h>
+#include <ccs.h>
+#include <libgulm.h>
-#include "libdevmapper.h"
-#include "ccs.h"
#include "list.h"
#include "locking.h"
#include "log.h"
@@ -51,7 +52,6 @@
#include "lvm-functions.h"
#include "clvmd.h"
#include "clvmd-gulm.h"
-#include "libgulm.h"
/* Hash list of nodes in the cluster */
static struct dm_hash_table *node_hash;
--- LVM2/daemons/clvmd/clvmd.c 2007/03/29 13:59:33 1.34
+++ LVM2/daemons/clvmd/clvmd.c 2007/04/27 17:46:16 1.35
@@ -37,6 +37,7 @@
#include <getopt.h>
#include <syslog.h>
#include <errno.h>
+#include <libdlm.h>
#include "clvmd-comms.h"
#include "lvm-functions.h"
@@ -44,7 +45,6 @@
#include "version.h"
#include "clvmd.h"
#include "refresh_clvmd.h"
-#include "libdlm.h"
#include "system-lv.h"
#include "list.h"
#include "log.h"
--- LVM2/daemons/clvmd/lvm-functions.c 2007/04/24 15:13:13 1.29
+++ LVM2/daemons/clvmd/lvm-functions.c 2007/04/27 17:46:16 1.30
@@ -30,11 +30,11 @@
#include <errno.h>
#include <syslog.h>
#include <assert.h>
+#include <libdevmapper.h>
+#include <libdlm.h>
-#include "libdevmapper.h"
#include "list.h"
#include "lvm-types.h"
-#include "libdlm.h"
#include "clvm.h"
#include "clvmd-comms.h"
#include "clvmd.h"
--- LVM2/daemons/clvmd/system-lv.c 2005/01/13 13:24:02 1.2
+++ LVM2/daemons/clvmd/system-lv.c 2007/04/27 17:46:16 1.3
@@ -36,8 +36,11 @@
#include <dirent.h>
#include <errno.h>
#include <mntent.h>
+#include <libdlm.h>
+#ifdef HAVE_CCS
+#include <ccs.h>
+#endif
-#include "libdlm.h"
#include "log.h"
#include "list.h"
#include "locking.h"
@@ -45,9 +48,6 @@
#include "clvm.h"
#include "clvmd-comms.h"
#include "clvmd.h"
-#ifdef HAVE_CCS
-#include "ccs.h"
-#endif
#define SYSTEM_LV_FILESYSTEM "ext2"
#define SYSTEM_LV_MOUNTPOINT "/tmp/.clvmd-XXXXXX"
--- LVM2/daemons/clvmd/tcp-comms.c 2006/05/09 21:23:49 1.15
+++ LVM2/daemons/clvmd/tcp-comms.c 2007/04/27 17:46:16 1.16
@@ -34,8 +34,8 @@
#include <syslog.h>
#include <netdb.h>
#include <assert.h>
+#include <libdevmapper.h>
-#include "libdevmapper.h"
#include "clvm.h"
#include "clvmd-comms.h"
#include "clvmd.h"
--- LVM2/dmeventd/mirror/dmeventd_mirror.c 2007/01/25 23:32:29 1.17
+++ LVM2/dmeventd/mirror/dmeventd_mirror.c 2007/04/27 17:46:16 1.18
@@ -12,10 +12,10 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "libdevmapper.h"
-#include "libdevmapper-event.h"
#include "lvm2cmd.h"
+#include <libdevmapper.h>
+#include <libdevmapper-event.h>
#include <errno.h>
#include <signal.h>
#include <string.h>
--- LVM2/lib/activate/activate.c 2007/03/08 21:08:25 1.121
+++ LVM2/lib/activate/activate.c 2007/04/27 17:46:16 1.122
@@ -168,7 +168,7 @@
{
return 0;
}
-int lvs_in_vg_activated_by_uuid_only(struct volume_group *vg);
+int lvs_in_vg_activated_by_uuid_only(struct volume_group *vg)
{
return 0;
}
--- LVM2/lib/misc/lib.h 2006/08/17 18:23:44 1.10
+++ LVM2/lib/misc/lib.h 2007/04/27 17:46:16 1.11
@@ -19,7 +19,7 @@
#ifndef _LVM_LIB_H
#define _LVM_LIB_H
-#include <configure.h>
+#include "configure.h"
#define _REENTRANT
#define _GNU_SOURCE
^ permalink raw reply [flat|nested] 4+ messages in thread
* LVM2 ./WHATS_NEW ./make.tmpl.in daemons/clvmd/ ...
@ 2007-01-11 17:12 agk
0 siblings, 0 replies; 4+ messages in thread
From: agk @ 2007-01-11 17:12 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: agk@sourceware.org 2007-01-11 17:12:27
Modified files:
. : WHATS_NEW make.tmpl.in
daemons/clvmd : Makefile.in
tools : Makefile.in
tools/fsadm : Makefile.in
Log message:
Use CFLAGS when linking so mixed sparc builds can supply -m64
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.534&r2=1.535
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/make.tmpl.in.diff?cvsroot=lvm2&r1=1.46&r2=1.47
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/Makefile.in.diff?cvsroot=lvm2&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/Makefile.in.diff?cvsroot=lvm2&r1=1.77&r2=1.78
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/fsadm/Makefile.in.diff?cvsroot=lvm2&r1=1.1&r2=1.2
--- LVM2/WHATS_NEW 2007/01/10 19:56:38 1.534
+++ LVM2/WHATS_NEW 2007/01/11 17:12:26 1.535
@@ -1,5 +1,6 @@
Version 2.02.18 -
====================================
+ Use CFLAGS when linking so mixed sparc builds can supply -m64.
Prevent permission changes on active mirrors.
Print warning instead of error message if lvconvert cannot zero volume.
Add snapshot options to lvconvert man page.
--- LVM2/make.tmpl.in 2007/01/09 20:31:08 1.46
+++ LVM2/make.tmpl.in 2007/01/11 17:12:26 1.47
@@ -75,6 +75,9 @@
ifneq ("@DMDIR@", "")
LDFLAGS += -L@DMDIR@/lib/ioctl
+ ifeq ("@DMEVENTD@", "yes")
+ LDFLAGS += -L@DMDIR@/dmeventd
+ endif
endif
LDFLAGS += -L$(top_srcdir)/lib -L$(libdir)
@@ -170,18 +173,19 @@
ifeq ("@LIB_SUFFIX@","so")
$(LIB_SHARED): $(OBJECTS) $(LDDEPS)
$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
- $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
+ $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
endif
ifeq ("@LIB_SUFFIX@","dylib")
$(LIB_SHARED): $(OBJECTS) $(LDDEPS)
$(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \
- $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
+ $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
endif
%.so: %.a
$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
- $(CLDFLAGS) $(LIBS) -o $@ @CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@
+ $(CFLAGS) $(CLDFLAGS) $(LIBS) -o $@ \
+ @CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@
$(LIB_STATIC): $(OBJECTS)
$(RM) $@
--- LVM2/daemons/clvmd/Makefile.in 2006/10/04 08:22:16 1.16
+++ LVM2/daemons/clvmd/Makefile.in 2007/01/11 17:12:27 1.17
@@ -71,7 +71,8 @@
install_clvmd
clvmd: $(OBJECTS) $(top_srcdir)/lib/liblvm.a
- $(CC) -o clvmd $(OBJECTS) $(LDFLAGS) $(LVMLIBS) $(LMLIBS) $(LIBS)
+ $(CC) -o clvmd $(OBJECTS) $(CFLAGS) $(LDFLAGS) \
+ $(LVMLIBS) $(LMLIBS) $(LIBS)
.PHONY: install_clvmd
--- LVM2/tools/Makefile.in 2006/10/26 20:37:13 1.77
+++ LVM2/tools/Makefile.in 2007/01/11 17:12:27 1.78
@@ -101,11 +101,12 @@
include $(top_srcdir)/make.tmpl
lvm: $(OBJECTS) lvm.o $(top_srcdir)/lib/liblvm.a
- $(CC) -o $@ $(OBJECTS) lvm.o $(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic
+ $(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm.o \
+ $(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic
lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm.a
- $(CC) -o $@ $(OBJECTS) lvm-static.o -static $(LDFLAGS) $(LVMLIBS) \
- $(LIBS) -rdynamic
+ $(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm-static.o -static \
+ $(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic
liblvm2cmd.a: $(top_srcdir)/lib/liblvm.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
cat $(top_srcdir)/lib/liblvm.a > $@
--- LVM2/tools/fsadm/Makefile.in 2004/06/15 17:29:20 1.1
+++ LVM2/tools/fsadm/Makefile.in 2007/01/11 17:12:27 1.2
@@ -23,7 +23,7 @@
include $(top_srcdir)/make.tmpl
fsadm: $(OBJECTS)
- $(CC) -o $@ $(OBJECTS) -rdynamic
+ $(CC) -o $@ $(CFLAGS) $(OBJECTS) -rdynamic
install: fsadm
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) fsadm \
^ permalink raw reply [flat|nested] 4+ messages in thread
* LVM2 ./WHATS_NEW ./make.tmpl.in daemons/clvmd/ ...
@ 2004-08-18 18:57 agk
0 siblings, 0 replies; 4+ messages in thread
From: agk @ 2004-08-18 18:57 UTC (permalink / raw)
To: lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: agk@sourceware.org 2004-08-18 18:57:40
Modified files:
. : WHATS_NEW make.tmpl.in
daemons/clvmd : Makefile.in
include : Makefile.in
lib/format1 : Makefile.in
lib/format_pool: Makefile.in
lib/locking : Makefile.in
lib/mirror : Makefile.in
lib/snapshot : Makefile.in
man : Makefile.in
Log message:
Cluster-extension-only installation.
Patches:
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.67&r2=1.68
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/make.tmpl.in.diff?cvsroot=lvm2&r1=1.38&r2=1.39
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/Makefile.in.diff?cvsroot=lvm2&r1=1.2&r2=1.3
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/include/Makefile.in.diff?cvsroot=lvm2&r1=1.5&r2=1.6
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/lib/format1/Makefile.in.diff?cvsroot=lvm2&r1=1.7&r2=1.8
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/lib/format_pool/Makefile.in.diff?cvsroot=lvm2&r1=1.3&r2=1.4
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/lib/locking/Makefile.in.diff?cvsroot=lvm2&r1=1.1&r2=1.2
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/lib/mirror/Makefile.in.diff?cvsroot=lvm2&r1=1.2&r2=1.3
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/lib/snapshot/Makefile.in.diff?cvsroot=lvm2&r1=1.2&r2=1.3
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/man/Makefile.in.diff?cvsroot=lvm2&r1=1.12&r2=1.13
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-03-04 11:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-03-04 11:12 LVM2 ./WHATS_NEW ./make.tmpl.in daemons/clvmd/ zkabelac
-- strict thread matches above, loose matches on Subject: below --
2007-04-27 17:46 agk
2007-01-11 17:12 agk
2004-08-18 18:57 agk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).