From: Zdenek Kabelac <zkabelac@sourceware.org>
To: lvm-devel@redhat.com
Subject: main - makefiles: deps also for cxx
Date: Mon, 12 Apr 2021 07:55:39 +0000 (GMT) [thread overview]
Message-ID: <20210412075539.5B91C39FCC77@sourceware.org> (raw)
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=ebf33323b93870f811c5a701826cfab1f4d41489
Commit: ebf33323b93870f811c5a701826cfab1f4d41489
Parent: 75424dd6927ac38c97ca4acc78b7f4933cd7b139
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Sat Apr 10 01:21:33 2021 +0200
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Mon Apr 12 09:54:16 2021 +0200
makefiles: deps also for cxx
Generate deps also for .cxx.
Remove include dir deps - there is nothing to build.
---
Makefile.in | 5 -----
libdm/make.tmpl.in | 2 +-
make.tmpl.in | 2 +-
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 5dd642f63..4dceaba1d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,8 +47,6 @@ include $(top_srcdir)/base/Makefile
include $(top_srcdir)/device_mapper/Makefile
include $(top_srcdir)/test/unit/Makefile
-libdm: include
-libdaemon: include
lib: libdaemon $(BASE_TARGET) $(DEVICE_MAPPER_TARGET)
daemons: lib libdaemon tools
scripts: lib
@@ -59,11 +57,8 @@ all_man: tools
test: tools daemons
unit-test run-unit-test: test
-lib.device-mapper: include.device-mapper
-libdm.device-mapper: include.device-mapper
daemons.device-mapper: libdm.device-mapper
tools.device-mapper: libdm.device-mapper
-scripts.device-mapper: include.device-mapper
device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper
device_mapper: device-mapper
diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in
index f7a5a7a73..a306101d5 100644
--- a/libdm/make.tmpl.in
+++ b/libdm/make.tmpl.in
@@ -403,7 +403,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64
%.o: %.cpp $(DEPS)
@echo " [CXX] $(<F)"
@mkdir -p $(@D)
- $(Q) $(CXX) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(CXXFLAGS) $(CXXFLAGS_$@) $< -o $@
+ $(Q) $(CXX) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(CXXFLAGS) $(CXXFLAGS_$@) $< -o $@
%.pot: %.c $(DEPS)
@echo " [CC] $@"
diff --git a/make.tmpl.in b/make.tmpl.in
index 73bf298c7..6145b0bd5 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -454,7 +454,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64
%.o: %.cpp $(DEPS)
@echo " [CXX] $(<F)"
@mkdir -p $(@D)
- $(Q) $(CXX) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(CXXFLAGS) $(CXXFLAGS_$@) $< -o $@
+ $(Q) $(CXX) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(CXXFLAGS) $(CXXFLAGS_$@) $< -o $@
%.pot: %.c $(DEPS)
@echo " [CC] $(<F)"
reply other threads:[~2021-04-12 7:55 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210412075539.5B91C39FCC77@sourceware.org \
--to=zkabelac@sourceware.org \
--cc=lvm-devel@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.