From ab5815c1fd8b060f342f103e7cc95e250360cee8 Mon Sep 17 00:00:00 2001 From: edgrif <edgrif> Date: Fri, 17 Mar 2006 17:00:13 +0000 Subject: [PATCH] move zmapUtilsDNA.[ch] to zmapFASTA.[ch] --- src/include/Makefile.am | 2 ++ src/include/ZMap/zmapFASTA.h | 15 +++++++-------- src/lib/Makefile.am | 3 ++- src/zmapUtils/zmapFASTA.c | 6 +++--- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/include/Makefile.am b/src/include/Makefile.am index 82c3993ed..9c871c13e 100755 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -9,6 +9,8 @@ ZMap/zmapFeature.h \ ZMap/zmapGFF.h \ ZMap/zmapManager.h \ ZMap/zmapNavigator.h \ +ZMap/zmapPeptide.h \ +ZMap/zmapFASTA.h \ ZMap/zmapReadLine.h \ ZMap/zmapServer.h \ ZMap/zmapServerProtocol.h \ diff --git a/src/include/ZMap/zmapFASTA.h b/src/include/ZMap/zmapFASTA.h index 46c980ca7..91c05ecdf 100755 --- a/src/include/ZMap/zmapFASTA.h +++ b/src/include/ZMap/zmapFASTA.h @@ -1,6 +1,6 @@ -/* File: zmapUtilsDNA.h +/* File: zmapFASTA.h * Author: Ed Griffiths (edgrif@sanger.ac.uk) - * Copyright (c) Sanger Institute, 2005 + * Copyright (c) Sanger Institute, 2006 *------------------------------------------------------------------- * ZMap is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -20,15 +20,14 @@ * This file is part of the ZMap genome database package * originated by * Ed Griffiths (Sanger Institute, UK) edgrif@sanger.ac.uk, - * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk, - * Rob Clack (Sanger Institute, UK) rnc@sanger.ac.uk + * Roy Storey (Sanger Institute, UK) rds@sanger.ac.uk * - * Description: + * Description: Interface to FASTA routines. * * HISTORY: - * Last edited: Mar 17 16:16 2006 (edgrif) - * Created: Tue Nov 8 15:23:27 2005 (edgrif) - * CVS info: $Id: zmapFASTA.h,v 1.1 2006-03-17 16:19:07 edgrif Exp $ + * Last edited: Mar 17 16:59 2006 (edgrif) + * Created: Fri Mar 17 16:59:08 2006 (edgrif) + * CVS info: $Id: zmapFASTA.h,v 1.2 2006-03-17 17:00:13 edgrif Exp $ *------------------------------------------------------------------- */ #ifndef ZMAP_UTILS_DNA_H diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 56d3bd4c0..8ca36a7ee 100755 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -65,12 +65,13 @@ libZMap_a_SOURCES = $(top_srcdir)/zmapConfig/zmapConfig.c \ $(top_srcdir)/zmapUtils/zmapConfigDir.c \ $(top_srcdir)/zmapUtils/zmapConfigDir_P.h \ $(top_srcdir)/zmapUtils/zmapFileUtils.c \ - $(top_srcdir)/zmapUtils/zmapDNAUtils.c \ + $(top_srcdir)/zmapUtils/zmapFASTA.c \ $(top_srcdir)/zmapUtils/zmapGUIutils.c \ $(top_srcdir)/zmapUtils/zmapGUImenus.c \ $(top_srcdir)/zmapUtils/zmapGLibUtils.c \ $(top_srcdir)/zmapUtils/zmapHandle.c \ $(top_srcdir)/zmapUtils/zmapLogging.c \ + $(top_srcdir)/zmapUtils/zmapPeptide.c \ $(top_srcdir)/zmapUtils/zmapReadLine.c \ $(top_srcdir)/zmapUtils/zmapReadLine_P.h \ $(top_srcdir)/zmapUtils/zmapUtils.c \ diff --git a/src/zmapUtils/zmapFASTA.c b/src/zmapUtils/zmapFASTA.c index e7b559f3b..7671dfea9 100755 --- a/src/zmapUtils/zmapFASTA.c +++ b/src/zmapUtils/zmapFASTA.c @@ -26,15 +26,15 @@ * * Exported functions: See ZMap/zmapFASTA.h * HISTORY: - * Last edited: Mar 17 16:25 2006 (edgrif) + * Last edited: Mar 17 16:36 2006 (edgrif) * Created: Fri Mar 17 16:24:30 2006 (edgrif) - * CVS info: $Id: zmapFASTA.c,v 1.1 2006-03-17 16:25:52 edgrif Exp $ + * CVS info: $Id: zmapFASTA.c,v 1.2 2006-03-17 17:00:13 edgrif Exp $ *------------------------------------------------------------------- */ #include <string.h> #include <ZMap/zmapUtils.h> -#include <ZMap/zmapUtilsDNA.h> +#include <ZMap/zmapFASTA.h> /* THIS FILE WOULD BE BETTER NAMED zmapFASTAUtils.c....perhaps I will change it... */ -- GitLab