Merge pull request ash211#33 from pgaurav/master

please merge
Janderson3 · Jun 27, 2011 · cf4e693 · cf4e693
2 parents 2e72f93 + 2e9862a
commit cf4e693
Show file tree

Hide file tree

Showing 27 changed files with 1,963 additions and 43 deletions.
diff --git a/gtfold-mfe/configure b/gtfold-mfe/configure
@@ -6047,7 +6047,7 @@ fi
 
 ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile include/Makefile"
 
-ac_config_files="$ac_config_files data/Turner99/Makefile data/Turner04/Makefile data/Andronescu/Makefile data/UNAParams/Makefile"
+ac_config_files="$ac_config_files data/Turner99/Makefile data/Turner04/Makefile data/Andronescu/Makefile data/UNAParams/Makefile data/RNAParams/Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -6701,6 +6701,7 @@ do
     "data/Turner04/Makefile") CONFIG_FILES="$CONFIG_FILES data/Turner04/Makefile" ;;
     "data/Andronescu/Makefile") CONFIG_FILES="$CONFIG_FILES data/Andronescu/Makefile" ;;
     "data/UNAParams/Makefile") CONFIG_FILES="$CONFIG_FILES data/UNAParams/Makefile" ;;
+    "data/RNAParams/Makefile") CONFIG_FILES="$CONFIG_FILES data/RNAParams/Makefile" ;;
 
   *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

diff --git a/gtfold-mfe/configure.in b/gtfold-mfe/configure.in
@@ -178,7 +178,7 @@ AM_CONDITIONAL(GTFOLD_DEBUG, test x$debug = xtrue)
 
 dnl Create makefiles and other configuration files
 AC_CONFIG_FILES([Makefile src/Makefile data/Makefile include/Makefile])
-AC_CONFIG_FILES([data/Turner99/Makefile data/Turner04/Makefile data/Andronescu/Makefile data/UNAParams/Makefile])
+AC_CONFIG_FILES([data/Turner99/Makefile data/Turner04/Makefile data/Andronescu/Makefile data/UNAParams/Makefile data/RNAParams/Makefile])
 
 dnl Generate `config.status' and launch it
 AC_OUTPUT

diff --git a/gtfold-mfe/data/Makefile.am b/gtfold-mfe/data/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = UNAParams Turner04 Turner99 Andronescu 
+SUBDIRS = UNAParams RNAParams Turner04 Turner99 Andronescu 
 
diff --git a/gtfold-mfe/data/Makefile.in b/gtfold-mfe/data/Makefile.in
@@ -189,7 +189,7 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = UNAParams Turner04 Turner99 Andronescu 
+SUBDIRS = UNAParams RNAParams Turner04 Turner99 Andronescu 
 all: all-recursive
 
 .SUFFIXES:

diff --git a/gtfold-mfe/data/RNAParams/Makefile.am b/gtfold-mfe/data/RNAParams/Makefile.am
@@ -0,0 +1,23 @@
+## Process this file with automake to produce Makefile.in
+
+gtfold_datadir = $(datadir)/@PACKAGE@/RNAParams
+
+gtfold_data_DATA = \
+	stack.DAT\
+	miscloop.DAT\
+	dangle.DAT\
+	loop.DAT\
+	int11.DAT\
+	int21.DAT\
+	int22.DAT\
+	tloop.DAT\
+	tstackh.DAT\
+	tstacki.DAT\
+	tstacke.DAT\
+	tstackm.DAT
+
+
+EXTRA_DIST = $(gtfold_data_DATA)
+
+CLEANFILES = *~
+
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		SUBDIRS = UNAParams Turner04 Turner99 Andronescu
		SUBDIRS = UNAParams RNAParams Turner04 Turner99 Andronescu