CVSROOT: /cvs/dm
Module name: dmraid
Changes by: heinzm@sourceware.org 2010-03-19 11:29:26

Modified files:
tools : Makefile.in

Log message:
Fix pthread link dependency

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/tools/Makefile.in.diff?cvsroot=dm&r1=1.6&r2=1.7

--- dmraid/tools/Makefile.in 2010/03/16 16:02:16 1.6
+++ dmraid/tools/Makefile.in 2010/03/19 11:29:25 1.7
@@ -28,7 +28,7 @@
endif
endif

-DMRAIDLIBS=-ldmraid
+DMRAIDLIBS=-ldmraid -lpthread

ifeq ("@KLIBC@", "yes")
DMRAIDLIBS += -ldevmapper_klibc

--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel

CVSROOT: /cvs/dm
Module name: dmraid
Changes by: zkabelac@sourceware.org 2010-05-27 19:50:28

Modified files:
tools : Makefile.in

Log message:
Use top_builddir
Link only with dmraid (pthread is devmapper dependency)
Do not link DMEVENTTOOLLIBS with dmraid
-ldl is linked via libdmraid
Use new INSTALL

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/tools/Makefile.in.diff?cvsroot=dm&r1=1.8&r2=1.9

--- dmraid/tools/Makefile.in 2010/05/27 14:28:48 1.8
+++ dmraid/tools/Makefile.in 2010/05/27 19:50:28 1.9
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2004-2005 Heinz Mauelshagen, Red Hat GmbH. All rights reserved.
+# Copyright (C) 2004-2010 Heinz Mauelshagen, Red Hat GmbH. All rights reserved.
#
# See file LICENSE at the top of this source tree for license information.
#
@@ -9,9 +9,9 @@
top_builddir = @top_builddir@
VPATH = @srcdir@
DIETLIBC = @DIETLIBC@
-KIBC = @KLIBC@
+KLIBC = @KLIBC@

-INCLUDES += -I $(src_dir)
+INCLUDES += -I$(src_dir)

SOURCES=
dmraid.c
@@ -21,7 +21,7 @@
TARGETS=
dmraid

-include $(top_srcdir)/make.tmpl
+include $(top_builddir)/make.tmpl

ifeq ("@KLIBC@", "no")
ifeq ("@STATIC_LINK@", "no")
@@ -29,7 +29,7 @@
endif
endif

-DMRAIDLIBS=-ldmraid -lpthread
+DMRAIDLIBS=-ldmraid

# FIXME: use pkg-config here to get the list of needed librarie
# pkg-config --libs devmapper
@@ -61,25 +61,21 @@
endif
endif

-# Dynamic linker library
-LIBS += -ldl
-
all: $(TARGETS)

.PHONY: install_dmraid_tools remove_dmraid_tools

dmraid: $(OBJECTS) $(top_builddir)/lib/libdmraid.a
- $(CC) -o $@ $(OBJECTS) $(LDFLAGS) -L$(top_srcdir)/lib
- -L$(DESTDIR)$(libdir) $(DMRAIDLIBS) $(DMEVENTTOOLLIBS) $(DMRAIDLIBS) $(LIBS)
+ $(CC) -o $@ $(OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(DMRAIDLIBS) $(LIBS)

-dmevent_tool: $(top_srcdir)/lib/libdmraid.a
- $(CC) -o $@ $@.c $(INCLUDES) $(LDFLAGS) -L$(top_srcdir)/lib
- -L$(DESTDIR)$(libdir) $(DMRAIDLIBS) $(DMEVENTTOOLLIBS) $(DMRAIDLIBS) $(LIBS)
+dmevent_tool: $(top_builddir)/lib/libdmraid.a
+ $(CC) -o $@ $@.c $(INCLUDES) $(LDFLAGS) -L$(top_builddir)/lib
+ $(DMRAIDLIBS) $(DMEVENTTOOLLIBS) $(LIBS)

install_dmraid_tools: $(TARGETS)
@echo "Installing $(TARGETS) in $(DESTDIR)$(sbindir)";
- mkdir -p $(DESTDIR)$(sbindir);
- $(INSTALL) $(STRIP) $(TARGETS) $(DESTDIR)$(sbindir)
+ $(INSTALL_DIR) $(DESTDIR)$(sbindir);
+ $(INSTALL_PROGRAM) $(TARGETS) $(DESTDIR)$(sbindir)

install: install_dmraid_tools


--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel

CVSROOT: /cvs/dm
Module name: dmraid
Changes by: zkabelac@sourceware.org 2010-05-28 08:37:37

Modified files:
tools : Makefile.in

Log message:
Use SOURCES2 for dmevent_tool compilation

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/tools/Makefile.in.diff?cvsroot=dm&r1=1.9&r2=1.10

--- dmraid/tools/Makefile.in 2010/05/27 19:50:28 1.9
+++ dmraid/tools/Makefile.in 2010/05/28 08:37:37 1.10
@@ -18,6 +18,9 @@
commands.c
toollib.c

+SOURCES2=
+ dmevent_tool.c
+
TARGETS=
dmraid

@@ -68,8 +71,8 @@
dmraid: $(OBJECTS) $(top_builddir)/lib/libdmraid.a
$(CC) -o $@ $(OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(DMRAIDLIBS) $(LIBS)

-dmevent_tool: $(top_builddir)/lib/libdmraid.a
- $(CC) -o $@ $@.c $(INCLUDES) $(LDFLAGS) -L$(top_builddir)/lib
+dmevent_tool: $(OBJECTS2) $(top_builddir)/lib/libdmraid.a
+ $(CC) -o $@ $(OBJECTS2) $(INCLUDES) $(LDFLAGS) -L$(top_builddir)/lib
$(DMRAIDLIBS) $(DMEVENTTOOLLIBS) $(LIBS)

install_dmraid_tools: $(TARGETS)

--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel

CVSROOT: /cvs/dm
Module name: dmraid
Changes by: zkabelac@sourceware.org 2010-05-30 17:39:02

Modified files:
tools : Makefile.in

Log message:
Add version.h to DISCLEAN_TARGETS
Simplify install and remove targets

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/tools/Makefile.in.diff?cvsroot=dm&r1=1.10&r2=1.11

--- dmraid/tools/Makefile.in 2010/05/28 08:37:37 1.10
+++ dmraid/tools/Makefile.in 2010/05/30 17:39:02 1.11
@@ -11,6 +11,7 @@
DIETLIBC = @DIETLIBC@
KLIBC = @KLIBC@

+DISTCLEAN_TARGETS += version.h
INCLUDES += -I$(src_dir)

SOURCES=
@@ -24,14 +25,14 @@
TARGETS=
dmraid

-include $(top_builddir)/make.tmpl
-
ifeq ("@KLIBC@", "no")
ifeq ("@STATIC_LINK@", "no")
TARGETS += dmevent_tool
endif
endif

+include $(top_builddir)/make.tmpl
+
DMRAIDLIBS=-ldmraid

# FIXME: use pkg-config here to get the list of needed librarie
@@ -64,29 +65,20 @@
endif
endif

-all: $(TARGETS)
-
-.PHONY: install_dmraid_tools remove_dmraid_tools
+.PHONY: install_dmraid_tools

-dmraid: $(OBJECTS) $(top_builddir)/lib/libdmraid.a
+dmraid: $(OBJECTS) $(top_builddir)/lib/libdmraid.a
$(CC) -o $@ $(OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(DMRAIDLIBS) $(LIBS)

dmevent_tool: $(OBJECTS2) $(top_builddir)/lib/libdmraid.a
$(CC) -o $@ $(OBJECTS2) $(INCLUDES) $(LDFLAGS) -L$(top_builddir)/lib
- $(DMRAIDLIBS) $(DMEVENTTOOLLIBS) $(LIBS)
+ $(DMEVENTTOOLLIBS) $(DMRAIDLIBS) $(LIBS)

install_dmraid_tools: $(TARGETS)
- @echo "Installing $(TARGETS) in $(DESTDIR)$(sbindir)";
- $(INSTALL_DIR) $(DESTDIR)$(sbindir);
+ $(INSTALL_DIR) $(DESTDIR)$(sbindir)
$(INSTALL_PROGRAM) $(TARGETS) $(DESTDIR)$(sbindir)

install: install_dmraid_tools

-remove_dmraid_tools:
- @echo "Removing $(TARGETS) from $(DESTDIR)$(sbindir)";
- for f in $(TARGETS);
- do
- rm -f $(DESTDIR)$(sbindir)/$$f;
- done
-
-remove: remove_dmraid_tools
+remove:
+ $(RM) $(addprefix $(DESTDIR)$(sbindir)/,$(TARGETS))

--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel