public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org>
To: cluster-cvs-relay@redhat.com
Subject: cluster: STABLE3 - config: cleanup rng2ldif build
Date: Wed, 09 Sep 2009 08:58:00 -0000 [thread overview]
Message-ID: <20090909085751.A459112035E@lists.fedorahosted.org> (raw)
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=64b7b036cdbb228508bbe2c3c667fc775b940c79
Commit: 64b7b036cdbb228508bbe2c3c667fc775b940c79
Parent: 6ba6404b0725fc61bd7df34734caa6b204ce1f28
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate: Wed Sep 9 10:56:29 2009 +0200
Committer: Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Wed Sep 9 10:57:09 2009 +0200
config: cleanup rng2ldif build
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
config/tools/ldap/Makefile | 3 +++
config/tools/ldap/rng2ldif/Makefile | 16 ++++++++--------
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/config/tools/ldap/Makefile b/config/tools/ldap/Makefile
index 5c6b2d6..f58c788 100644
--- a/config/tools/ldap/Makefile
+++ b/config/tools/ldap/Makefile
@@ -2,6 +2,8 @@ TARGET= confdb2ldif
SBINDIRT=$(TARGET)
+SUBDIRS=rng2ldif
+
all: ${TARGET}
include ../../../make/defines.mk
@@ -9,6 +11,7 @@ include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk
+include $(OBJDIR)/make/passthrough.mk
OBJS= confdb2ldif.o
diff --git a/config/tools/ldap/rng2ldif/Makefile b/config/tools/ldap/rng2ldif/Makefile
index 5192780..75a2b03 100644
--- a/config/tools/ldap/rng2ldif/Makefile
+++ b/config/tools/ldap/rng2ldif/Makefile
@@ -10,8 +10,9 @@ include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk
CFLAGS += -D_GNU_SOURCE
-CFLAGS += -I. -I${incdir}
+CFLAGS += -I.
CFLAGS += `xml2-config --cflags`
+CFLAGS += -I${incdir}
LDFLAGS += `xml2-config --libs`
LDFLAGS += -L${libdir}
@@ -27,17 +28,16 @@ SHAREDOBJS= zalloc.o \
name.o
${TARGET1}: ${SHAREDOBJS} ${OBJS1}
- $(CC) -o $@ $^ $(EXTRA_LDFLAGS) $(LDFLAGS)
+ $(CC) -o $@ $^ $(LDFLAGS)
${TARGET2}: ${SHAREDOBJS} ${OBJS2}
$(CC) -o $@ $^ $(LDFLAGS)
-ldif-update: all ../../../plugins/ldap/ldap-base.csv
- make -C ../../xml cluster.rng
- ./rng2ldif ../../xml/cluster.rng \
- ../../../plugins/ldap/ldap-base.csv \
- ../../../plugins/ldap/99cluster.ldif
-
+ldif-update: all $(SRCDIR)/config/plugins/ldap/ldap-base.csv
+ make -C $(OBJDIR)/config/tools/xml cluster.rng
+ ./rng2ldif $(OBJDIR)/config/tools/xml/cluster.rng \
+ $(SRCDIR)/config/plugins/ldap/ldap-base.csv \
+ $(SRCDIR)/config/plugins/ldap/99cluster.ldif
clean: generalclean
reply other threads:[~2009-09-09 8:58 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=20090909085751.A459112035E@lists.fedorahosted.org \
--to=fabbione@fedoraproject.org \
--cc=cluster-cvs-relay@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 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).