Fixed the OS/2 specific files for the latest release.

[splint.git] / src / Makefile.os2

diff --git a/src/Makefile.os2 b/src/Makefile.os2
index 206b37bc4a2b05373c740d80bcba6019250190c0..b2f4c78fdb5b1d9d5f4c410b5cd0084d39160442 100644 (file)
--- a/src/Makefile.os2
+++ b/src/Makefile.os2
@@ -7,17 +7,6 @@
 SHELL = /usr/bin/ksh\r
 \r
 include ../os2/make.vars\r
-binDir = ../bin\r
-\r
-\r
-.SUFFIXES = \r
-.SUFFIXES = .c .h $O $(EXEEXT) .l .check\r
-\r
-# Some preferences\r
-### We use the no-lines option to prevent confusion with splint flag settings.\r
-### Should fix splint to avoid this...\r
-YFLAGS = -v -t -d --debug --no-lines\r
-LFLAGS = -L\r
 \r
 BISON_SRC = cgrammar.y  llgrammar.y  mtgrammar.y  signature.y\r
 \r
@@ -110,13 +99,14 @@ COMMONSRC =  $(CPPSRC) $(CSRC) $(CHECKSRC) $(GENERALSRC) \
 \r
 LCLSRC = $(LCLSETSRC) $(LCLLISTSRC) $(LSLSRC) $(COMMONSRC) $(LCLONLYSRC) \r
 \r
-ALLSRC = $(GRAMSRC) $(SPLINTSRC) $(OVERFLOWCHSRC) $(LCLSRC) snprintf.c\r
+ALLSRC = $(GRAMSRC) $(SPLINTSRC) $(OVERFLOWCHSRC) $(LCLSRC)\r
+# snprintf.c\r
 \r
 #files to run Splint on\r
 LINTSRC = $(COMMONSRC) $(SPLINTSRC)\r
 \r
 lcl_SOURCES = $(LCLSRC)\r
-CONFIG_HEADER = $(top_builddir)/config.h\r
+CONFIG_HEADER = ../config.h\r
 \r
 splint_SOURCES = $(ALLSRC)\r
 splint_OBJECTS = $(splint_SOURCES:.c=$O)\r
@@ -124,7 +114,7 @@ splint_OBJECTS = $(splint_SOURCES:.c=$O)
 # Keep it fake\r
 .PHONY: lcl$(EXEEXT)\r
 \r
-DEFS = -DHAVE_CONFIG_H\r
+DEFS = -DHAVE_CONFIG_H -D__pid_t=pid_t\r
 DEFAULT_INCLUDES =  -I. -I..\r
 \r
 ## Sources that need to be built\r
@@ -134,7 +124,26 @@ BUILT_SOURCES = Headers/signature_gen.h Headers/cgrammar_tokens.h \
                 llgrammar.c mtgrammar.c Headers/flag_codes.gen \\r
                 $(DER_FILES)\r
 \r
-all: $(BUILT_SOURCES) splint$(EXEEXT) $(binDir)/splint$(EXEEXT)\r
+all: $(binDir)/splint$(EXEEXT) ../os2/setenv.cmd\r
+       $(MAKE) -C ../lib -f Makefile.os2\r
+\r
+$(CONFIG_HEADER): ../os2/os2config.h.in\r
+       $(SED) -e 's|@DEFAULT_LARCHPATH@|$(DEFAULT_LARCHPATH)|' \\r
+       -e 's|@DEFAULT_LCLIMPORTDIR@|$(DEFAULT_LCLIMPORTDIR)|' \\r
+       -e 's|@GCC_INCLUDE_DIR@|$(GCC_INCLUDE_DIR)|' \\r
+       -e 's|@GCC_INCLUDE_DIR2@|$(GCC_INCLUDE_DIR2)|' \\r
+       -e 's|@TARGET_CPU@|$(TARGET_CPU)|' \\r
+       -e 's|@UNAME@|$(UNAME)|' \\r
+       -e 's|@LCL_COMPILE@|$(LCL_COMPILE)|' \\r
+       -e 's|@LCL_PARSE_VERSION@|$(LCL_PARSE_VERSION)|' \\r
+       -e 's|@SPLINT_VERSION@|$(SPLINT_VERSION)|' \\r
+       -e 's|@SYSTEM_LIBDIR@|$(SYSTEM_LIBDIR)|' \\r
+       $< >$@\r
+\r
+../os2/setenv.cmd: ../os2/setenv.cmd.in\r
+       $(SED) -e 's|@LCL_VERSION@|$(LCL_VERSION)|' \\r
+       -e 's|@BASEDIR@|$(BASEDIR)|' \\r
+       $< | tr '/' '\\\\\\' >$@\r
 \r
 Headers/signature_gen.h signature.c: signature.c.der signature.y\r
 ifndef BISON\r
@@ -205,8 +214,6 @@ cscanner.c: cscanner.l
 \r
 Headers/flag_codes.gen: flags.def\r
        grep "FLG_" flags.def > Headers/flag_codes.gen\r
-       $(MAKE)\r
-       cd ../lib; $(MAKE)\r
 \r
 $(binDir)/splint$(EXEEXT):  splint$(EXEEXT)\r
        -$(RM) -f $(binDir)/splint$(EXEEXT)\r
@@ -225,8 +232,8 @@ snprintf$O: snprintf.c
 %$O: %.c\r
        $(CC) $(CFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(CPPFLAGS) -c $<\r
 \r
-splint$(EXEEXT) : $(splint_OBJECTS) \r
-       $(CC) $(OFLAG)$@ $^ $(LDFLAGS)\r
+splint$(EXEEXT) : $(CONFIG_HEADER) $(BUILT_SOURCES) $(splint_OBJECTS) \r
+       $(CC) $(OFLAG)$@ $(splint_OBJECTS) $(LDFLAGS)\r
 \r
 list:\r
        @echo "$(splint_OBJECTS)"\r