--- rpl/src/Makefile.am	2019/02/07 21:44:14	1.116
+++ rpl/src/Makefile.am	2024/10/29 16:41:02	1.121
@@ -1,6 +1,6 @@
 -include $(top_builddir)/tools/openmotif.lib
 
-ldadd_libncurses = $(top_builddir)/tools/@NCURSES@/lib/@LIB_PREFIX@ncurses.a
+ldadd_libncurses = $(top_builddir)/tools/@NCURSES@/lib/@LIB_PREFIX@ncursesw.a
 include_libncurses = -I$(top_builddir)/tools/@NCURSES@/include \
 		-I$(top_srcdir)/tools/@NCURSES@/include
 
@@ -9,7 +9,8 @@ ldadd_libreadline = $(top_builddir)/tool
 include_libreadline = -I$(top_srcdir)/tools/@READLINE@ \
 		-I$(top_builddir)/tools/@READLINE@ -DREADLINE_LIBRARY
 
-ldadd_libgsl = $(top_builddir)/tools/@GSL@/.libs/@LIB_PREFIX@gsl.a
+ldadd_libgsl = $(top_builddir)/tools/@GSL@/.libs/@LIB_PREFIX@gsl.a \
+			   $(top_builddir)/tools/@GSL@/cblas/.libs/@LIB_PREFIX@gslcblas.a
 include_libgsl = -I$(top_builddir)/tools/@GSL@
 
 ldadd_libiconv = $(top_builddir)/tools/@ICONV@/lib/.libs/@LIB_PREFIX@iconv.a
@@ -269,7 +270,7 @@ INIT_EXE=init.c
 
 INIT_LIB=librpl.c
 
-LIB=@MALLOC@ @OPENMP@
+LIB=@MALLOC@
 
 bin_PROGRAMS = rpl
 lib_LIBRARIES = librpl.a
@@ -456,10 +457,10 @@ nodist_rpl_SOURCES = \
 		$(SRCCc) $(SRCHc) $(SRCCPPc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
 		$(SRCXPM) $(SRCINCc)
 rpl_LDFLAGS = -g @PROFILAGE@ @EXPORT_DYNAMIC@ @ELF@ @CYGWIN_LDFLAGS@ \
-			  -Wl,--exclude-libs,libssl.a:libcrypto.a:libsqlite3.a:liblapack.a:libblas.a:librplcas.a:libncurses.a:libz.a:libgsl.a:libreadline.a:libhistory.a:libsigsegv.a
+			  -Wl,--exclude-libs,libssl.a:libcrypto.a:libsqlite3.a:liblapack.a:libblas.a:librplcas.a:libncursesn.a:libz.a:libgsl.a:libreadline.a:libhistory.a:libsigsegv.a
 rpl_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \
 		 -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@ \
-		 -Wconversion
+		 -Wconversion -ftabstop=4
 rpl_CXXFLAGS = $(AM_CFLAGS) -Wall -Wextra
 rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c
 rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second-underscore -fno-f2c
@@ -498,7 +499,7 @@ rpl_LDADD = \
 		$(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \
 		$(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \
 		$(ldadd_libsqlite) $(ldadd_libsigsegv) $(ldadd_libz) \
-		$(ldadd_libgsl) $(ldadd_librplcas) @libMySQLlib@ @libPgSQLlib@ \
+		$(ldadd_librplcas) $(ldadd_libgsl) @libMySQLlib@ @libPgSQLlib@ \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		@WHOLE_LIB1@ \
@@ -544,7 +545,7 @@ librpl:
 			$(ldadd_libcrypto) $(ldadd_libssl) $(ldadd_libsqlite) \
 			$(ldadd_librplcas) $(ldadd_libsigsegv) $(ldadd_libmotif); \
 	do \
-		cp -f $$i $(top_builddir)/librpl; \
+		if [ -e $$i ]; then cp -f $$i $(top_builddir)/librpl; fi; \
 	done
 	@(cd $(top_builddir)/librpl && n=0 && \
 			echo "    Building standalone librpl.a"; \