upgraded to latest gcc

cobrun/Makefile

@@ -1,15 +1,17 @@
+# Generated automatically from Makefile.in by configure.
 #
-# Makefile (MinGW) for htcobrun
+# Makefile for htcobrun
 #
 
-prefix=C:/TinyCOBOL
+SHELL=/bin/sh
+
+prefix=/usr/local
 exec_prefix=${prefix}
 
-INSTALL=install.exe
-INSTALL_DATA=${INSTALL}
+INSTALL=/usr/bin/install -c
+INSTALL_DATA=${INSTALL} -m 644
 
-INSTBIN=${prefix}
-#INSTBIN=${prefix}/bin
+INSTBIN=${prefix}/bin
 INSTRC=${prefix}/share/htcobol
 
 tc_library=../lib/libhtcobol.a
@@ -18,13 +20,13 @@ RM=rm -f
 
 CCX=gcc
 
-INCLUDES=-I../lib -I..
-LIBS=-L/usr/local/lib -L../lib -lhtcobol
-LIBS1=-L/usr/local/lib -L../lib -ldb -lpdcurses
-LIBS2=-L/usr/local/lib -L../lib -lhtcobol -ldb
-#LIBS2=-L/usr/local/lib -L../lib -lhtcobol -ldb -lpdcurses
-CCXFLAGS=${INCLUDES}
+INCLUDES=-I../lib -I../
+LIBS=
+LIBS1=-lncurses -ldb -lm -ldl
+LIBS2=-L../lib -lhtcobol -lncurses -ldb -lm -ldl
 LDFLAGS=
+CCXFLAGS=${INCLUDES}
+
 
 SRC1 = htcobrun.c
 SRC2 = htcobrun.c
@@ -32,38 +34,38 @@ SRC2 = htcobrun.c
 OBJ1 = $(SRC1:.c=.o)
 OBJ2 = $(SRC2:.c=.o)
 
-PROG1 = htcobrun2
-PROG2 = htcobrun
+PROG1 = htcobrun
+PROG2 = htcobrun2
 PROG3 = htcobrun.sh
 
 #
-# Rules for compiling C sources
+# Rules for compiling .c sources
 #
-.SUFFIX: .c .o .lo
+.SUFFIX: .c .o
 .c.o:
 	$(CCX) $(CCXFLAGS) -c $<
 
 
-all: ${PROG2} 
-#all: ${PROG1} ${PROG2} 
-
-# This will not compile and link on Win32 for some reason
+#all: ${PROG1} ${PROG2}
+all: ${PROG1}
+ 
+# Static library version
 ${PROG1}: 
 	${CCX} ${SRC1} -Wl,-export-dynamic -o ${PROG1} \
 	${INCLUDES} -Wl,-whole-archive ${tc_library} \
 	-Wl,-no-whole-archive $(LIBS1)
 
-${PROG2}:  ${OBJ2}
-	$(CCX) -o $@ ${OBJ2} $(LDFLAGS) $(LIBS2) 
+# Shared library version
+${PROG2}: ${OBJ2}
+	$(CCX) -o $@ ${OBJ2} $(LDFLAGS1) $(LIBS2) 
 
 clean:
-	@${RM} ${OBJ1} ${OBJ2} ${PROG1}.exe ${PROG2}.exe \
-	*.exe *.def *.o *.lis *.i *.s core
+	@${RM} ${OBJ1} ${OBJ2} ${PROG1} ${PROG2} *.o *.s core
 
 #install:  $(PROG1) $(PROG2)
-install:  $(PROG2)
-#	strip $(PROG1)
-#	${INSTALL} -m 755 $(PROG1) $(INSTBIN)/$(PROG1)
-	strip $(PROG2).exe
-	${INSTALL} $(PROG2).exe $(INSTBIN)/$(PROG2).exe
+install:  $(PROG1)
+	strip $(PROG1)
+	${INSTALL} -m 755 $(PROG1) $(INSTBIN)/$(PROG1)
+#	strip $(PROG2)
+#	${INSTALL} -m 755 $(PROG2) $(INSTBIN)/$(PROG2)
 #	${INSTALL} -m 755 $(PROG3) $(INSTBIN)/$(PROG3)