* as/Makefile: new EXEEXT

* as/z80/Makefile: remove trailing slash of BUILDIR
* as/z80/clean.mk: new EXEEXT
* Makefile.common.in: add to CFLAGS (and others), don't replace it
* support/cpp2/Makefile.in: new EXEEXT

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

diff --git a/ChangeLog b/ChangeLog
index 8641431f522ef740748efe4e13c9573cdf2d1f88..cd441bc8dcbf808899f5bad248263be0bd1a3e0e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-04-26  Bernhard Held <bernhard@bernhardheld.de>
+
+       * as/Makefile: new EXEEXT
+       * as/z80/Makefile: remove trailing slash of BUILDIR
+       * as/z80/clean.mk: new EXEEXT
+       * Makefile.common.in: add to CFLAGS (and others), don't replace it
+       * support/cpp2/Makefile.in: new EXEEXT 
+
 2003-04-24  Bernhard Held <bernhard@bernhardheld.de>
 
        Cygwin's gcc always appends .exe: 'gcc -o a a.c' creates a.exe;

diff --git a/Makefile.common.in b/Makefile.common.in
index 8dd978b554602541794989222af2ae7b227b0652..405c8bb026ae9fdd6e5cf9003545a9a00e361bdf 100644 (file)
--- a/Makefile.common.in
+++ b/Makefile.common.in
@@ -46,13 +46,13 @@ transform       = @program_transform_name@
 
 # Flags
 
-DEFS            = $(subs -DHAVE_CONFIG_H,,@DEFS@)
-CPPFLAGS        = $(INCLUDEFLAGS) -I. -I$(PRJDIR) -I$(SLIB)
-CFLAGS          = -Wall @CFLAGS@
-LDFLAGS         = @LDFLAGS@
+DEFS           += $(subs -DHAVE_CONFIG_H,,@DEFS@)
+CPPFLAGS       += $(INCLUDEFLAGS) -I. -I$(PRJDIR) -I$(SLIB)
+CFLAGS         += -Wall @CFLAGS@
+LDFLAGS        += @LDFLAGS@
 M_OR_MM         = @M_OR_MM@
 
-EXTRALIBS      = @LIBS@
+EXTRALIBS      += @LIBS@
 
 # Shared settings between all the sub Makefiles
 # Done here so that we don't have to start a Make from the top levelport

diff --git a/as/Makefile b/as/Makefile
index d9b8c97cf4c79c62b5a06f9752a235e71f073455..67898be3ab89dad27a45485249427393124c5b4c 100644 (file)
--- a/as/Makefile
+++ b/as/Makefile
@@ -1,5 +1,5 @@
 PRJDIR = ..
-BUILDDIR=../../bin/
+BUILDDIR=../../bin
 include $(PRJDIR)/Makefile.common
 
 PORTS = z80 gbz80
@@ -9,16 +9,16 @@ all:
        $(MAKE) -C z80 _as-z80 _as-gbz80 E=$(E) BUILDDIR=$(BUILDDIR)
 
 install: all install-doc
-       $(INSTALL) $(PRJDIR)/bin/as-z80 `echo $(bindir)/as-z80|sed '$(transform)'`
-       $(STRIP) `echo $(bindir)/as-z80|sed '$(transform)'`
-       $(INSTALL) $(PRJDIR)/bin/as-gbz80 `echo $(bindir)/as-gbz80|sed '$(transform)'`
-       $(STRIP) `echo $(bindir)/as-gbz80|sed '$(transform)'`
+       $(INSTALL) $(PRJDIR)/bin/as-z80$(EXEEXT) `echo $(bindir)/as-z80$(EXEEXT)|sed '$(transform)'`
+       $(STRIP) `echo $(bindir)/as-z80$(EXEEXT)|sed '$(transform)'`
+       $(INSTALL) $(PRJDIR)/bin/as-gbz80$(EXEEXT) `echo $(bindir)/as-gbz80$(EXEEXT)|sed '$(transform)'`
+       $(STRIP) `echo $(bindir)/as-gbz80$(EXEEXT)|sed '$(transform)'`
 
 install-doc:
        $(INSTALL) -d $(docdir)/aslink
        cp -f `find doc -maxdepth 1 -not -type d` $(docdir)/aslink
 
 uninstall:
-       cd $(bindir); rm -f as-z80 as-gbz80
+       cd $(bindir); rm -f as-z80$(EXEEXT) as-gbz80$(EXEEXT)
 
 include clean.mk

diff --git a/as/z80/Makefile b/as/z80/Makefile
index beb428f466592b7ebfcaeb1030c62860fc1ab5ae..526ba30bd21269ebad6b31d80f3607dac69822cb 100644 (file)
--- a/as/z80/Makefile
+++ b/as/z80/Makefile
@@ -14,7 +14,7 @@ SRC   = asdata.c asexpr.c aslex.c aslist.c asmain.c asout.c \
 OBJS   = $(SRC:%.c=$(OBJDIR)/%.o)
 SLIBOBJS       = $(SLIBSRC:%.c=$(OBJDIR)/%.o) 
 
-BINS   = $(BUILDDIR)as$(EXT)$(EXEEXT)
+BINS   = $(BUILDDIR)/as$(EXT)$(EXEEXT)
 
 CFLAGS += $(CPPFLAGS) $(OPTS) -I. -DINDEXLIB -DMLH_MAP -DUNIX -DSDK
 CFLAGS += -funsigned-char

diff --git a/as/z80/clean.mk b/as/z80/clean.mk
index 03e9e8daf4e8cfefe7835e61f69719b708131b90..cf18deed5150603bc0f63c16b4fd8ddca81357df 100644 (file)
--- a/as/z80/clean.mk
+++ b/as/z80/clean.mk
@@ -1,11 +1,13 @@
 # Deleting all files created by building the program
 # --------------------------------------------------
+include ../../Makefile.common
+
 clean:
        rm -rf obj
        rm -f *core *[%~] *.[oa]
        rm -f .[a-z]*~
-       rm -f $(BUILDDIR)/as-z80   as-z80
-       rm -f $(BUILDDIR)/as-gbz80 as-gbz80
+       rm -f $(BUILDDIR)/as-z80$(EXEEXT)   as-z80$(EXEEXT)
+       rm -f $(BUILDDIR)/as-gbz80$(EXEEXT) as-gbz80$(EXEEXT)
 
 # Deleting all files created by configuring or building the program
 # -----------------------------------------------------------------

diff --git a/support/cpp2/Makefile.in b/support/cpp2/Makefile.in
index c4ec20e5484953c0c35e2bc18d2d6af8bf735fb5..007393cc1854a6fed963dce18014f29d067f6dfd 100644 (file)
--- a/support/cpp2/Makefile.in
+++ b/support/cpp2/Makefile.in
@@ -22,8 +22,9 @@
 #the Free Software Foundation, 59 Temple Place - Suite 330,
 #Boston MA 02111-1307, USA.
 
+EXEEXT = @EXEEXT@
 PRJDIR = ../..
-TARGET = $(PRJDIR)/bin/sdcpp
+TARGET = $(PRJDIR)/bin/sdcpp$(EXEEXT)
 
 # This is the default target.
 all: $(TARGET)
@@ -108,11 +109,11 @@ OBSTACK=obstack.o
 
 install: all
        mkdir -p $(bindir)
-       $(INSTALL) $(TARGET) `echo $(bindir)/sdcpp|sed '$(transform)'`
-       $(STRIP) `echo $(bindir)/sdcpp|sed '$(transform)'`
+       $(INSTALL) $(TARGET) `echo $(bindir)/sdcpp$(EXEEXT)|sed '$(transform)'`
+       $(STRIP) `echo $(bindir)/sdcpp$(EXEEXT)|sed '$(transform)'`
 
 uninstall:
-       rm -f $(bindir)/sdcpp
+       rm -f $(bindir)/sdcpp$(EXEEXT)
 clean:
        -rm -f $(TARGET) *.o core libcpp.a