upgraded to latest gcc

lib/Makefile

@@ -12,69 +12,61 @@ exec_prefix=${prefix}
 #
 CCX=gcc
 ASM=as
-INCLUDES=-I/usr/include -I/usr/local/include -I../lib -I..
-#CCXFLAGS=${INCLUDES} -g -Wall 
-#CCXFLAGS1=${INCLUDES} -g -Wall  
-CCXFLAGS=${INCLUDES} -Wall 
-CCXFLAGS1=${INCLUDES} -Wall  
-ACXFLAGS=-D -as
-
-WRES=windres
-WRESFLAGS=-O coff
+INCLUDES=-I/usr/include -I/usr/local/include -I../lib -I../ -I/usr/include/mysql
+CCXFLAGS=${INCLUDES} -fcommon -Wall -ggdb 
+CCXFLAGS1=${INCLUDES} -fcommon -Wall -fPIC -ggdb 
+ACXFLAGS=-as
 
 RANLIB=ranlib
 AR=ar
 
-#lib_dir=${prefix}/lib
-lib_dir=C:/TinyCOBOL
-
-#INSTRC=${prefix}/share/htcobol
-INSTRC=${lib_dir}
+INSTRC=${prefix}/share/htcobol
 RCFILE=htrtconf
 
-#INSTALL=/usr/bin/install -c
-INSTALL=install.exe
-#INSTALL_DATA=${INSTALL} -m 644
-INSTALL_DATA=${INSTALL}
+INSTALL=/usr/bin/install -c
+INSTALL_DATA=${INSTALL} -m 644
 
-MV   = mv -f
-RM   = rm -f
-LNK  = ln -sf
+MV    = mv -f
+RM    = rm -f
 MKDIR = mkdir -p
+LNK   = ln -sf
+GREP  = grep -v
 
 MAKEDEPEND=@MAKEDEPEND@
-#
-#LIBS=-L/usr/local/lib -lm -ldb -lpdcurses
-LIBS=-L/usr/local/lib -L/c/mingw/lib -lm -ldb -lpdcurses
+LIBS=-ldl -lm -ldb -lncurses -L/usr/lib/mysql -L/usr/lib
+
 #
 # Default install directory is set in htconfig.h
 #
+lib_dir=${prefix}/lib
 
-lib_version=0.73.0
+lib_version=0.74.0
 
 lib_name1=htcobol
+#lib_name2=htcobol2
 
 STATIC_LIB1=lib${lib_name1}.a
-SHARED_LIB1=${lib_name1}.dll
-SHARED_LIB1A=${lib_name1}.dll.a
-#SHARED_LIB1=lib${lib_name2}.dll
+#STATIC_LIB2=lib${lib_name2}.a
+SHARED_LIB1=lib${lib_name1}.so.${lib_version}
+#SHARED_LIB2=lib${lib_name2}.so.${lib_version}
 
-SRC1  = mcmath.c cobmove.c general.c fileio.c flckclient.c \
+SRC1  = mcmath.c general.c fileio.c \
 	pictures.c basicio.c strings.c screenio.c \
-	cobmove_9_.c cobmove_b_.c cobmove_c_.c cobmove_e_.c \
-	cobmove_f_.c cobmove_x_.c rterrors.c scr_curses.c intrinsic.c \
-	dyncall.c config.c
-#	dycall.c config.c
-#	dyncall.c ltdl.c config.c
-#	dyncall.c
+	cobmove.c cobmove_f_.c cobmove_x_.c cobmove_e_.c \
+	cobmove_9_.c cobmove_b_.c cobmove_c_.c \
+	rterrors.c scr_curses.c intrinsic.c \
+	dyncall.c flckclient.c config.c screen.c 
 
-SRC2 = htcobolrt.rc
+#SRC2  = dyncall.c  
+#SRC2  = dyncall_ltdl.c ltdl.c 
 
 OBJS1 = $(SRC1:.c=.o)
-OBJS2 = $(SRC2:.rc=.o)
+
+#OBJS2 = $(SRC2:.c=.o)
 
 OBJD1 = $(SRC1:.c=.lo)
-OBJD2 = $(SRC2:.rc=.lo)
+
+#OBJD2 = $(SRC2:.c=.lo)
 
 #
 # Rules for compiling .c .s sources
@@ -101,17 +93,14 @@ OBJD2 = $(SRC2:.rc=.lo)
 #   be used, since gdb will not work properly with shared libraries.
 #
 
-all: static-libs
-devel: static-libs shared-libs
+all: static-libs shared-libs
+#all: shared-libs
+#all: static-libs
+devel: static-libs
 
-static-libs: ${STATIC_LIB1}
-shared-libs: ${SHARED_LIB1}
+static-libs: ${STATIC_LIB1} # ${STATIC_LIB2}
 
-
-# Rules for building the DLL resources
-#
-htcobolrt.o: htcobolrt.rc
-	$(WRES) $(WRESFLAGS) $< $@
+shared-libs: ${SHARED_LIB1} # ${SHARED_LIB2}
 
 # Rules for building the static library
 #
@@ -119,30 +108,43 @@ ${STATIC_LIB1}: ${OBJS1}
 	${AR} cr ${STATIC_LIB1} ${OBJS1}
 	${RANLIB} ${STATIC_LIB1}
 
+${STATIC_LIB2}: ${OBJS2}
+	${AR} cr ${STATIC_LIB2} ${OBJS2}
+	${RANLIB} ${STATIC_LIB2}
 
 # Rules for building the shared library
 #
-${SHARED_LIB1}: ${OBJS1} $(OBJS2)
-	${CCX} -shared -Wl,--out-implib,${lib_name1}.dll.a,--output-def,${lib_name1}.def  -o ${SHARED_LIB1} $(OBJS1) $(OBJS2) ${LIBS}
+${SHARED_LIB1}: ${OBJD1}
+	${CCX} -shared -Wl,-soname,lib${lib_name1}.so.0 -o ${SHARED_LIB1} $(OBJD1) ${LIBS} 
+	${LNK} $(SHARED_LIB1) lib$(lib_name1).so.0
+	${LNK} $(SHARED_LIB1) lib$(lib_name1).so
+
+${SHARED_LIB2}: ${OBJD2}
+	${CCX} -shared -Wl,-soname,lib${lib_name2}.so.0 -o ${SHARED_LIB2} $(OBJD2) ${LIBS}
+	${LNK} $(SHARED_LIB2) lib$(lib_name2).so.0
+	${LNK} $(SHARED_LIB2) lib$(lib_name2).so
 
 clean:
-	@${RM} ${OBJS} ${STATIC_LIB1} \
-	${SHARED_LIB1} ${SHARED_LIB1}.a \
-	core *.bak *.o *.lo
+	@${RM} ${OBJS} ${OBJD} ${STATIC_LIB1} ${STATIC_LIB2} \
+	lib$(lib_name1).so* lib$(lib_name2).so* \
+	core *.bak *.txt *.o *.lo
 
-install: install-dir install-static install-shared install-rts-config
+install: install-static install-shared
 
 install-rts-config: 
-#	$(MKDIR)  $(INSTRC)
+	$(MKDIR)  $(INSTRC)
 	${INSTALL_DATA} $(RCFILE) $(INSTRC)/$(RCFILE)
 
-install-static: ${STATIC_LIB1}
-#	${INSTALL_DATA} ${STATIC_LIB1} ${lib_dir}/${STATIC_LIB1}
+#install-static: ${STATIC_LIB1} # ${STATIC_LIB2}
+install-static: ${STATIC_LIB1} install-rts-config
+	${INSTALL_DATA} ${STATIC_LIB1} ${lib_dir}/${STATIC_LIB1}
+#	${INSTALL_DATA} ${STATIC_LIB2} ${lib_dir}/${STATIC_LIB2}
 
-install-shared: ${SHARED_LIB1}
+#install-shared: ${SHARED_LIB1} # ${SHARED_LIB2}
+install-shared: ${SHARED_LIB1} install-rts-config
 	${INSTALL_DATA} ${SHARED_LIB1} ${lib_dir}/${SHARED_LIB1}
-#	${INSTALL_DATA} ${SHARED_LIB1A} ${lib_dir}/${SHARED_LIB1A}
-
-install-dir: 
-	$(MKDIR) $(INSTRC)
-
+#	${INSTALL_DATA} ${SHARED_LIB2} ${lib_dir}/${SHARED_LIB2}
+	${LNK} ${lib_dir}/$(SHARED_LIB1) ${lib_dir}/lib$(lib_name1).so
+#	${LNK} ${lib_dir}/$(SHARED_LIB2) ${lib_dir}/lib$(lib_name2).so
+	${LNK} ${lib_dir}/$(SHARED_LIB1) ${lib_dir}/lib$(lib_name1).so.0
+#	${LNK} ${lib_dir}/$(SHARED_LIB2) ${lib_dir}/lib$(lib_name2).so.0

lib/libhtcobol.so

@@ -0,0 +1 @@
+libhtcobol.so.0.74.0

lib/libhtcobol.so.0

@@ -0,0 +1 @@
+libhtcobol.so.0.74.0