Borland Makefile cleanup

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@2243 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/Bcc.inc b/Bcc.inc
index 29b4d079cf04316016b206dc92a6ff8e10de6be7..a2ff0f6faba97daf3b9228e60ed3a965e7bab326 100644 (file)
--- a/Bcc.inc
+++ b/Bcc.inc
@@ -1,8 +1,14 @@
 #Generic rules and options for building with Borland C++
 
+.cacheautodepend
+
+YACC = bison
+LEX = flex
+CC = bcc32
+
 SLIB = $(PRJDIR)/support/Util
 
-OFLAGS = -6 -O2 -g0 -w-proto
+OFLAGS = -6 -O2 -w-proto -g0
 
 .c.obj:
-        BCC32 -c -o$@ $(OFLAGS) $(CFLAGS) $(CPPFLAGS) -I$(SLIB) $<
+        $(CC) -c -o$@ $(OFLAGS) $(CFLAGS) $(CPPFLAGS) -I$(SLIB) $<

diff --git a/Makefile.bcc b/Makefile.bcc
index 0bf801f97496c4598e7503f803c3a0278be6e840..01df8e39500801bd83c9338dde21123d22ea6591 100644 (file)
--- a/Makefile.bcc
+++ b/Makefile.bcc
@@ -1,53 +1,34 @@
-all: as ports sdcc packihx cpp2
+# Makefile for Borlad C++
 
-as:
-       cd as\mcs51
-       make -f Makefile.bcc
-       cd ..\..
+all: config asx8051 as-z80 sdcc packihx cpp2
+
+
+config: sdcc_vc.h
+
+sdcc_vc.h: sdcc_vc_in.h configure_vc.awk
+        gawk -f configure_vc.awk sdcc_vc_in.h > sdcc_vc.h
+
+asx8051:
+        cd as\mcs51
+        make -f Makefile.bcc
+        cd ..\..
+
+as-z80:
+        cd as\z80
+        make -f Makefile.bcc
+        cd ..\..
 
 cpp2:
-       cd support\cpp2
-       make -f Makefile.bcc
-       cd ..\..
-
-ports: z80 mcs51 avr ds390 pic xa51
-
-z80:
-       cd src\z80
-       make -f Makefile.bcc
-       cd ..\..
-
-mcs51:
-       cd src\mcs51
-       make -f Makefile.bcc
-       cd ..\..
-
-avr:
-       cd src\avr
-       make -f Makefile.bcc
-       cd ..\..
-
-ds390:
-       cd src\ds390
-       make -f Makefile.bcc
-       cd ..\..
-
-pic:
-       cd src\pic
-       make -f Makefile.bcc
-       cd ..\..
-
-xa51:
-       cd src\xa51
-       make -f Makefile.bcc
-       cd ..\..
+        cd support\cpp2
+        make -f Makefile.bcc
+        cd ..\..
 
 sdcc:
-       cd src
-       make -f Makefile.bcc
-       cd ..
+        cd src
+        make -f Makefile.bcc
+        cd ..
 
 packihx:
-       cd packihx
-       make -f Makefile.bcc
-       cd ..
+        cd packihx
+        make -f Makefile.bcc
+        cd ..

diff --git a/as/mcs51/Makefile.bcc b/as/mcs51/Makefile.bcc
index 418cdac79013f84ccc9b6867d68511de98c1da7d..84e61f1f08edfa3d5cef1bd9d3038f888e0e3442 100644 (file)
--- a/as/mcs51/Makefile.bcc
+++ b/as/mcs51/Makefile.bcc
@@ -1,20 +1,8 @@
-# Generated automatically from Makefile.in by configure.
-#
-#
-#
+# Makefile for Borlad C++
 
-VERSION         = 2.2.0
-VERSIONHI       = 2
-VERSIONLO       = 2
-VERSIONP        = 0
+PRJDIR          = ../..
 
-PRJDIR         = ../..
-
-!include ..\..\Bcc.inc
-
-CFLAGS        =  -I. -I$(PRJDIR)
-M_OR_MM                = -MM
-LDFLAGS                = 
+!include $(PRJDIR)/Bcc.inc
 
 ASOBJECTS       = asmain.obj aslex.obj assym.obj assubr.obj asnoice.obj \
                   asexpr.obj asdata.obj aslist.obj asout.obj asstore.obj \
@@ -30,10 +18,8 @@ ASLINK          = $(PRJDIR)/bin/aslink.exe
 
 all: $(ASX8051) $(ASLINK)
 
-
 $(ASX8051): $(ASOBJECTS)
         $(CC) $(CFLAGS) -e$@ $(ASOBJECTS)
 
 $(ASLINK): $(LKOBJECTS)
         $(CC) $(CFLAGS) -e$@ $(LKOBJECTS)
-

diff --git a/device/examples/ds390/tinitalk/Makefile.bcc b/device/examples/ds390/tinitalk/Makefile.bcc
index 57dcf8033bb8ef23565c531b27bb9dfec6a0bee5..58c46dfbbe8d5ed621b4e4d3628107b04f39d9aa 100644 (file)
--- a/device/examples/ds390/tinitalk/Makefile.bcc
+++ b/device/examples/ds390/tinitalk/Makefile.bcc
@@ -1,18 +1,14 @@
-PRJDIR         = ..
+# Makefile for Borlad C++
+
+PRJDIR          = ../../../..
+
+!include $(PRJDIR)/Bcc.inc
 
 OBJECTS         = tinitalk.obj
 
 TARGET          = tinitalk.exe
 
-# Compiling entire program or any subproject
-# ------------------------------------------
 all: $(TARGET)
 
-
-# My rules
-# --------
 $(TARGET): $(OBJECTS)
-        bcc32 -e$(TARGET) $(OBJECTS)
-
-!include ..\Bcc.inc
-
+        $(CC) $(CFLAGS) -e$(TARGET) $(OBJECTS)

diff --git a/packihx/Makefile.bcc b/packihx/Makefile.bcc
index 4f03b9e5b98c88685a7542c4cadaa0d3cd78e931..8da1b594f2be5fa1b33aa9cd3a1ab60134a27420 100644 (file)
--- a/packihx/Makefile.bcc
+++ b/packihx/Makefile.bcc
@@ -1,18 +1,14 @@
-PRJDIR         = ..
+# Makefile for Borlad C++
+
+PRJDIR          = ..
+
+!include $(PRJDIR)/Bcc.inc
 
 OBJECTS         = packihx.obj
 
 TARGET          = $(PRJDIR)/bin/packihx.exe
 
-# Compiling entire program or any subproject
-# ------------------------------------------
 all: $(TARGET)
 
-
-# My rules
-# --------
 $(TARGET): $(OBJECTS)
-        bcc32 -e$(TARGET) $(OBJECTS)
-
-!include ..\Bcc.inc
-
+        $(CC) $(CFLAGS) -e$@ $(OBJECTS)

diff --git a/src/Makefile.bcc b/src/Makefile.bcc
index 01fb56c08011c16041590b3aff07454c9cd7de97..9bbd53417a418300c4dfe6e8cadbe2e12c5c6a4a 100644 (file)
--- a/src/Makefile.bcc
+++ b/src/Makefile.bcc
@@ -1,20 +1,13 @@
-PRJDIR         = ..
+# Makefile for Borlad C++
 
-# !include $(PRJDIR)/Makefile.common
+PRJDIR          = ..
 
-!include ..\Bcc.inc
-CFLAGS  = -I. -I.. -I..\support
+!include $(PRJDIR)/Bcc.inc
+CFLAGS = $(CFLAGS) -I$(PRJDIR)
 
 PORTS           = mcs51 xa51 z80 avr ds390 pic
 PORT_LIBS       = mcs51/port.lib xa51/port.lib z80/port.lib avr/port.lib ds390/port.lib pic/port.lib
 
-#LIBS          = -lgc
-#LIBDIRS               = -L$(PRJDIR)/support/gc
-#LIBGC           = $(PRJDIR)/support/gc/gc.lib
-LIBS=
-LIBDIRS=
-LIBGC=
-
 OBJECTS         = SDCCy.obj SDCClex.obj SDCChasht.obj SDCCmain.obj \
                   SDCCsymt.obj SDCCopt.obj SDCCast.obj SDCCmem.obj SDCCval.obj \
                   SDCCicode.obj SDCCbitv.obj SDCCset.obj SDCClabel.obj \
@@ -22,47 +15,51 @@ OBJECTS         = SDCCy.obj SDCClex.obj SDCChasht.obj SDCCmain.obj \
                   SDCClrange.obj SDCCptropt.obj SDCCpeeph.obj SDCCglue.obj \
                   asm.obj SDCCutil.obj SDCCmacro.obj
 
-SLIBOBJS       = $(SLIB)\SDCCerr.obj $(SLIB)\NewAlloc.obj $(SLIB)\MySystem.obj $(SLIB)\BuildCmd.obj
+SLIBOBJS        = $(SLIB)/SDCCerr.obj $(SLIB)/NewAlloc.obj $(SLIB)/MySystem.obj $(SLIB)/BuildCmd.obj
 
 TARGET          = $(PRJDIR)/bin/sdcc.exe
 
-# Compiling entire program or any subproject
-# ------------------------------------------
-all: $(LIBGC) $(TARGET)
+all: $(TARGET)
+
+ports: $(PORT_LIBS)
 
-ports:
-        for i in $(PORTS); do $(MAKE) -C $$i; done
+$(TARGET): ports $(OBJECTS) $(SLIBOBJS)
+        $(CC) -e$(TARGET) $(OBJECTS) $(SLIBOBJS) $(PORT_LIBS) $(LIBGC)
 
-#$(PRJDIR)/support/gc/libgc.a:
-#        cd $(PRJDIR)/support/gc && $(MAKE)
+mcs51/port.lib:
+        cd mcs51
+        make -f Makefile.bcc
+        cd ..
 
+xa51/port.lib:
+        cd xa51
+        make -f Makefile.bcc
+        cd ..
 
-!include Makefile.dep
-#!include clean.mk
+z80/port.lib:
+        cd z80
+        make -f Makefile.bcc
+        cd ..
 
+avr/port.lib:
+        cd avr
+        make -f Makefile.bcc
+        cd ..
 
-# My rules
-# --------
-$(TARGET): $(OBJECTS) $(SLIBOBJS) $(PORT_LIBS)
-        bcc32 -e$(TARGET) $(OBJECTS) $(SLIBOBJS) $(PORT_LIBS) $(LIBGC)
+ds390/port.lib:
+        cd ds390
+        make -f Makefile.bcc
+        cd ..
+
+pic/port.lib:
+        cd pic
+        make -f Makefile.bcc
+        cd ..
 
 SDCCy.h: SDCCy.c
 
 SDCCy.c: SDCC.y
-       $(YACC) -d -v -o $@ $<
+        $(YACC) -d -v -o $< SDCC.y
 
 SDCClex.c: SDCC.lex SDCCy.h
-       $(LEX) -t $< >$@
-
-.y.c:
-       rm -f $*.cc $*.h
-       $(YACC) -d $<
-       mv y.tab.c $*.cc
-       mv y.tab.h $*.h
-
-.l.c:
-       rm -f $*.cc
-       $(LEX) -t $< >$*.cc
-
-
-
+        $(LEX) -o $< SDCC.lex

diff --git a/src/avr/Makefile.bcc b/src/avr/Makefile.bcc
index b43fbe8e35ac50fc83340835b2a27094db28af18..8370b9f085b3e9b7c7e64cdf6a4ae916504b3606 100644 (file)
--- a/src/avr/Makefile.bcc
+++ b/src/avr/Makefile.bcc
@@ -1,22 +1,23 @@
-PRJDIR = ../..
+# Makefile for Borlad C++
 
-# !include $(PRJDIR)/Makefile.common
+PRJDIR = ../..
 
 OBJ = gen.obj ralloc.obj main.obj
 LIB = port.lib
 
-!include ..\..\Bcc.inc
-CFLAGS  = -I.. -I. -I..\.. -I..\..\support
+!include $(PRJDIR)/Bcc.inc
+CFLAGS = $(CFLAGS) -I.. -I$(PRJDIR)
 
 all: $(LIB)
 
 main.obj: main.c peeph.rul
 
-$(LIB): peeph.rul $(OBJ)
-       if exist $(LIB) del $(LIB)
-       tlib /a $(LIB) +gen.obj +ralloc.obj +main.obj
-       
-peeph.rul: peeph.def
-        gawk -f ../SDCCpeeph.awk peeph.def > peeph.rul
+$(LIB): $(OBJ)
+        if exist $(LIB) del $(LIB)
+        tlib $@ @&&!
++$(**: = &^
++)
+!
 
-# include clean.mk
+.def.rul:
+        gawk -f ../SDCCpeeph.awk $< > $@

diff --git a/src/ds390/Makefile.bcc b/src/ds390/Makefile.bcc
index b43fbe8e35ac50fc83340835b2a27094db28af18..8370b9f085b3e9b7c7e64cdf6a4ae916504b3606 100644 (file)
--- a/src/ds390/Makefile.bcc
+++ b/src/ds390/Makefile.bcc
@@ -1,22 +1,23 @@
-PRJDIR = ../..
+# Makefile for Borlad C++
 
-# !include $(PRJDIR)/Makefile.common
+PRJDIR = ../..
 
 OBJ = gen.obj ralloc.obj main.obj
 LIB = port.lib
 
-!include ..\..\Bcc.inc
-CFLAGS  = -I.. -I. -I..\.. -I..\..\support
+!include $(PRJDIR)/Bcc.inc
+CFLAGS = $(CFLAGS) -I.. -I$(PRJDIR)
 
 all: $(LIB)
 
 main.obj: main.c peeph.rul
 
-$(LIB): peeph.rul $(OBJ)
-       if exist $(LIB) del $(LIB)
-       tlib /a $(LIB) +gen.obj +ralloc.obj +main.obj
-       
-peeph.rul: peeph.def
-        gawk -f ../SDCCpeeph.awk peeph.def > peeph.rul
+$(LIB): $(OBJ)
+        if exist $(LIB) del $(LIB)
+        tlib $@ @&&!
++$(**: = &^
++)
+!
 
-# include clean.mk
+.def.rul:
+        gawk -f ../SDCCpeeph.awk $< > $@

diff --git a/src/izt/Makefile.bcc b/src/izt/Makefile.bcc
index 615c811dfb94e663060fa38e0bd29f4205714f95..c1f2438305f4281e79fdf995b14cc93a4d3b4e33 100644 (file)
--- a/src/izt/Makefile.bcc
+++ b/src/izt/Makefile.bcc
@@ -1,23 +1,23 @@
-PRJDIR = ../..
+# Makefile for Borlad C++
 
-# !include $(PRJDIR)/Makefile.common
+PRJDIR = ../..
 
 OBJ = i186.obj ralloc.obj gen.obj tlcs900h.obj gen_generic.obj aop.obj util.obj
 LIB = port.lib
 
-!include ..\..\Bcc.inc
-CFLAGS  = -I.. -I. -I..\.. -I..\..\support
+!include $(PRJDIR)/Bcc.inc
+CFLAGS = $(CFLAGS) -I.. -I$(PRJDIR)
 
 all: $(LIB)
 
 i186.obj: i186.c i186_mappings.i
 
 $(LIB): $(OBJ)
-       if exist $(LIB) del $(LIB)
-        tlib /a $(LIB) +i186.obj +ralloc.obj +gen.obj +tlcs900h.obj
-        tlib /a $(LIB) +gen_generic.obj +aop.obj +util.obj
-       
+        if exist $(LIB) del $(LIB)
+        tlib $@ @&&!
++$(**: = &^
++)
+!
+
 .def.rul:
         gawk -f ../SDCCpeeph.awk $< > $@
-
-# include clean.mk

diff --git a/src/mcs51/Makefile.bcc b/src/mcs51/Makefile.bcc
index b43fbe8e35ac50fc83340835b2a27094db28af18..8370b9f085b3e9b7c7e64cdf6a4ae916504b3606 100644 (file)
--- a/src/mcs51/Makefile.bcc
+++ b/src/mcs51/Makefile.bcc
@@ -1,22 +1,23 @@
-PRJDIR = ../..
+# Makefile for Borlad C++
 
-# !include $(PRJDIR)/Makefile.common
+PRJDIR = ../..
 
 OBJ = gen.obj ralloc.obj main.obj
 LIB = port.lib
 
-!include ..\..\Bcc.inc
-CFLAGS  = -I.. -I. -I..\.. -I..\..\support
+!include $(PRJDIR)/Bcc.inc
+CFLAGS = $(CFLAGS) -I.. -I$(PRJDIR)
 
 all: $(LIB)
 
 main.obj: main.c peeph.rul
 
-$(LIB): peeph.rul $(OBJ)
-       if exist $(LIB) del $(LIB)
-       tlib /a $(LIB) +gen.obj +ralloc.obj +main.obj
-       
-peeph.rul: peeph.def
-        gawk -f ../SDCCpeeph.awk peeph.def > peeph.rul
+$(LIB): $(OBJ)
+        if exist $(LIB) del $(LIB)
+        tlib $@ @&&!
++$(**: = &^
++)
+!
 
-# include clean.mk
+.def.rul:
+        gawk -f ../SDCCpeeph.awk $< > $@

diff --git a/src/pic/Makefile.bcc b/src/pic/Makefile.bcc
index 409e064888aa568a83b9736c8c935cb8fdf9a155..ca21fa6e7c5e1a1cac627a0b38edcb2cd2e949e5 100644 (file)
--- a/src/pic/Makefile.bcc
+++ b/src/pic/Makefile.bcc
@@ -1,23 +1,23 @@
-PRJDIR = ../..
+# Makefile for Borlad C++
 
-# !include $(PRJDIR)/Makefile.common
+PRJDIR = ../..
 
 OBJ = device.obj gen.obj genarith.obj ralloc.obj main.obj glue.obj pcode.obj pcodeflow.obj pcodepeep.obj pcoderegs.obj
 LIB = port.lib
 
-!include ..\..\Bcc.inc
-CFLAGS  = -I.. -I. -I..\.. -I..\..\support -D__FUNCTION__=__FILE__
+!include $(PRJDIR)/Bcc.inc
+CFLAGS = $(CFLAGS) -I.. -I$(PRJDIR)
 
 all: $(LIB)
 
 main.obj: main.c peeph.rul
 
-$(LIB): peeph.rul $(OBJ)
-       if exist $(LIB) del $(LIB)
-        tlib /a $(LIB) +device.obj +gen.obj +genarith.obj +ralloc.obj +main.obj +glue.obj
-        tlib /a $(LIB) +pcode.obj +pcodeflow.obj +pcodepeep.obj +pcoderegs.obj
-
-peeph.rul: peeph.def
-        gawk -f ../SDCCpeeph.awk peeph.def > peeph.rul
+$(LIB): $(OBJ)
+        if exist $(LIB) del $(LIB)
+        tlib $@ @&&!
++$(**: = &^
++)
+!
 
-# include clean.mk
+.def.rul:
+        gawk -f ../SDCCpeeph.awk $< > $@

diff --git a/src/pic16/Makefile.bcc b/src/pic16/Makefile.bcc
index c5ced976378b84141be6748f4452a4bcdc7c2239..ac93ce28227887974e436d56c6771f1809d36eed 100644 (file)
--- a/src/pic16/Makefile.bcc
+++ b/src/pic16/Makefile.bcc
@@ -1,23 +1,23 @@
-PRJDIR = ../..
+# Makefile for Borlad C++
 
-# !include $(PRJDIR)/Makefile.common
+PRJDIR = ../..
 
 OBJ = gen.obj genarith.obj ralloc.obj main.obj glue.obj pcode.obj pcodepeep.obj
 LIB = port.lib
 
-!include ..\..\Bcc.inc
-CFLAGS  = -I.. -I. -I..\.. -I..\..\support -D__FUNCTION__=__FILE__
+!include $(PRJDIR)/Bcc.inc
+CFLAGS = $(CFLAGS) -I.. -I$(PRJDIR)
 
 all: $(LIB)
 
 main.obj: main.c peeph.rul
 
-$(LIB): peeph.rul $(OBJ)
+$(LIB): $(OBJ)
         if exist $(LIB) del $(LIB)
-        tlib /a $(LIB) +gen.obj +genarith.obj +ralloc.obj +main.obj +glue.obj
-        tlib /a $(LIB) +pcode.obj +pcodepeep.obj
-
-peeph.rul: peeph.def
-        gawk -f ../SDCCpeeph.awk peeph.def > peeph.rul
+        tlib $@ @&&!
++$(**: = &^
++)
+!
 
-# include clean.mk
+.def.rul:
+        gawk -f ../SDCCpeeph.awk $< > $@

diff --git a/src/xa51/Makefile.bcc b/src/xa51/Makefile.bcc
index 1284ef8378a315466955b25697ce124e14983742..8370b9f085b3e9b7c7e64cdf6a4ae916504b3606 100644 (file)
--- a/src/xa51/Makefile.bcc
+++ b/src/xa51/Makefile.bcc
@@ -1,22 +1,23 @@
-PRJDIR = ../..
+# Makefile for Borlad C++
 
-# !include $(PRJDIR)/Makefile.common
+PRJDIR = ../..
 
 OBJ = gen.obj ralloc.obj main.obj
 LIB = port.lib
 
-!include ..\..\Bcc.inc
-CFLAGS  = -I.. -I. -I..\.. -I..\..\support -D__FUNCTION__=__FILE__
+!include $(PRJDIR)/Bcc.inc
+CFLAGS = $(CFLAGS) -I.. -I$(PRJDIR)
 
 all: $(LIB)
 
 main.obj: main.c peeph.rul
 
-$(LIB): peeph.rul $(OBJ)
-       if exist $(LIB) del $(LIB)
-       tlib /a $(LIB) +gen.obj +ralloc.obj +main.obj
-       
-peeph.rul: peeph.def
-        gawk -f ../SDCCpeeph.awk peeph.def > peeph.rul
+$(LIB): $(OBJ)
+        if exist $(LIB) del $(LIB)
+        tlib $@ @&&!
++$(**: = &^
++)
+!
 
-# include clean.mk
+.def.rul:
+        gawk -f ../SDCCpeeph.awk $< > $@

diff --git a/src/z80/Makefile.bcc b/src/z80/Makefile.bcc
index 6823217a9a35b0ead01ba2c9d7df48f3bcaff56c..b0427df82d63622e246383d8698565cf3d771910 100644 (file)
--- a/src/z80/Makefile.bcc
+++ b/src/z80/Makefile.bcc
@@ -1,28 +1,23 @@
-PRJDIR = ../..
+# Makefile for Borlad C++
 
-# !include $(PRJDIR)/Makefile.common
+PRJDIR = ../..
 
 OBJ = gen.obj ralloc.obj main.obj support.obj
 LIB = port.lib
 
-!include ..\..\Bcc.inc
-CFLAGS  = -I.. -I. -I..\.. -I..\..\support
+!include $(PRJDIR)/Bcc.inc
+CFLAGS = $(CFLAGS) -I.. -I$(PRJDIR)
 
 all: $(LIB)
 
 main.obj: main.c peeph.rul peeph-z80.rul peeph-gbz80.rul
 
-$(LIB): peeph.rul $(OBJ)
-       if exist $(LIB) del $(LIB)
-        tlib /a $(LIB) +gen.obj +ralloc.obj +main.obj +support.obj
-
-peeph.rul: peeph.def
-        gawk -f ../SDCCpeeph.awk peeph.def > peeph.rul
-
-peeph-gbz80.rul: peeph-gbz80.def
-        gawk -f ../SDCCpeeph.awk peeph-gbz80.def > peeph-gbz80.rul
-
-peeph-z80.rul: peeph-z80.def
-        gawk -f ../SDCCpeeph.awk peeph-z80.def > peeph-z80.rul
+$(LIB): $(OBJ)
+        if exist $(LIB) del $(LIB)
+        tlib $@ @&&!
++$(**: = &^
++)
+!
 
-# include clean.mk
+.def.rul:
+        gawk -f ../SDCCpeeph.awk $< > $@

diff --git a/support/cpp2/Makefile.bcc b/support/cpp2/Makefile.bcc
index 4553ab66b54f2550537faf100e5bd419822bd1ae..f5b941f901e19c17da311e50be85cb9589038a22 100644 (file)
--- a/support/cpp2/Makefile.bcc
+++ b/support/cpp2/Makefile.bcc
@@ -1,28 +1,26 @@
-PRJDIR          = ..\..
+# Makefile for Borlad C++
+
+PRJDIR          = ../..
+
+!include $(PRJDIR)/Bcc.inc
+
+CFLAGS = $(CFLAGS) -I. -I./libiberty -DHAVE_CONFIG_H
 
 OBJECTS         = cppmain.obj intl.obj \
-                cpplib.obj cpplex.obj cppmacro.obj cppexp.obj cppfiles.obj \
-                cpphash.obj cpperror.obj cppinit.obj cppdefault.obj \
-                hashtable.obj mkdeps.obj prefix.obj version.obj mbchar.obj \
-                safe-ctype.obj obstack.obj splay-tree.obj lbasename.obj
+                  cpplib.obj cpplex.obj cppmacro.obj cppexp.obj cppfiles.obj \
+                  cpphash.obj cpperror.obj cppinit.obj cppdefault.obj \
+                  hashtable.obj mkdeps.obj prefix.obj version.obj mbchar.obj \
+                  safe-ctype.obj obstack.obj splay-tree.obj lbasename.obj
 
 TARGET          = $(PRJDIR)/bin/sdcpp.exe
 
-# Compiling entire program or any subproject
-# ------------------------------------------
 all: $(TARGET)
 
-CFLAGS = -I. -I.\libiberty -DHAVE_CONFIG_H
-
-# My rules
-# --------
 auto-host.h: auto-host_vc_in.h
         copy auto-host_vc_in.h auto-host.h > nul
 
 $(TARGET): auto-host.h $(OBJECTS)
-        bcc32 -e$(TARGET) $(OBJECTS)
-
-!include ..\..\Bcc.inc
+        $(CC) $(CFLAGS) -e$(TARGET) $(OBJECTS)
 
 safe-ctype.obj: libiberty\safe-ctype.c
 obstack.obj: libiberty\obstack.c