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: master - ccs: turn more ccs_tool code into legacy code Date: Thu, 07 Aug 2008 07:16:00 -0000 [thread overview] Message-ID: <20080807043259.1BD5312003F@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=abdd841250d0a81aeacfe3735cb55d6a4e8d0727 Commit: abdd841250d0a81aeacfe3735cb55d6a4e8d0727 Parent: 3049d1173834e0916ae25182f9d4fec626042d17 Author: Fabio M. Di Nitto <fdinitto@redhat.com> AuthorDate: Thu Aug 7 06:31:51 2008 +0200 Committer: Fabio M. Di Nitto <fdinitto@redhat.com> CommitterDate: Thu Aug 7 06:31:51 2008 +0200 ccs: turn more ccs_tool code into legacy code the update functionality connects to ccsd that is now legacy code. filter this out when build normal ccs_tool. Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com> --- ccs/ccs_tool/Makefile | 7 +++++-- ccs/ccs_tool/ccs_tool.c | 2 +- ccs/ccs_tool/editconf.c | 4 ++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ccs/ccs_tool/Makefile b/ccs/ccs_tool/Makefile index 8359a9e..5d6aa5f 100644 --- a/ccs/ccs_tool/Makefile +++ b/ccs/ccs_tool/Makefile @@ -16,10 +16,13 @@ include $(OBJDIR)/make/clean.mk include $(OBJDIR)/make/install.mk include $(OBJDIR)/make/uninstall.mk -OBJS= ccs_tool.o \ - update.o \ +OBJS = ccs_tool.o \ editconf.o +ifdef legacy_code +OBJS += update.o +endif + CFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE CFLAGS += -I${cmanincdir} `xml2-config --cflags` CFLAGS += -I${ccsincdir} -I$(S)/../include diff --git a/ccs/ccs_tool/ccs_tool.c b/ccs/ccs_tool/ccs_tool.c index 9963f0d..c05a07e 100644 --- a/ccs/ccs_tool/ccs_tool.c +++ b/ccs/ccs_tool/ccs_tool.c @@ -5,9 +5,9 @@ #include <errno.h> #include "copyright.cf" -#include "update.h" #include "editconf.h" #ifdef LEGACY_CODE +#include "update.h" #include "libccscompat.h" #else #include "ccs.h" diff --git a/ccs/ccs_tool/editconf.c b/ccs/ccs_tool/editconf.c index 2194279..53b0ed6 100644 --- a/ccs/ccs_tool/editconf.c +++ b/ccs/ccs_tool/editconf.c @@ -11,7 +11,9 @@ #include <libxml/tree.h> +#ifdef LEGACY_CODE #include "update.h" +#endif #define MAX_NODES 256 @@ -226,6 +228,7 @@ static void save_file(xmlDoc *doc, struct option_info *ninfo) } } +#ifdef LEGACY_CODE /* Try to tell ccsd if needed */ if ((strcmp(ninfo->configfile, ninfo->outputfile) == 0 && ninfo->tell_ccsd) || ninfo->force_ccsd) @@ -233,6 +236,7 @@ static void save_file(xmlDoc *doc, struct option_info *ninfo) printf("running ccs_tool update...\n"); update(ninfo->outputfile); } +#endif /* free the document */ xmlFreeDoc(doc);
reply other threads:[~2008-08-07 4:34 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=20080807043259.1BD5312003F@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: linkBe 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).