* as/link/aslink.h: cosmetic changes

* as/link/mcs51/Makefile.in,
* as/link/z80/Makefile.in: fixed build on CF where VPATH is used

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

diff --git a/ChangeLog b/ChangeLog
index 60b1c21050b3b31d28756bc851977a0765d6227c..c120f361023a5ff622acf1c275168c168633cca0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-19 Maarten Brock <sourceforge.brock AT dse.nl>
+
+       * as/link/aslink.h: cosmetic changes
+       * as/link/mcs51/Makefile.in,
+       * as/link/z80/Makefile.in: fixed build on CF where VPATH is used
+
 2006-09-17 Maarten Brock <sourceforge.brock AT dse.nl>
 
        * as/link/aslink.h,

diff --git a/as/link/aslink.h b/as/link/aslink.h
index 15796382e27344173f5cb6025802fb96109932e1..b3d0adfa2762b0fe3d260c01ea2a499e2645aef8 100644 (file)
--- a/as/link/aslink.h
+++ b/as/link/aslink.h
@@ -199,11 +199,11 @@
 /*
  * File types
  */
-#define F_INV  0               /* invalid */
+#define F_INV   0               /* invalid */
 #define F_STD   1               /* stdin */
 #define F_LNK   2               /* File.lnk */
 #define F_REL   3               /* File.rel */
-#define        F_CMD   4               /* Command line */
+#define F_CMD   4               /* Command line */
 
 #ifdef GAMEBOY
 /*
@@ -616,8 +616,8 @@ extern  int     stacksize;      /*      Pack data memory flag
                                  */
 extern  int     jflag;          /*      NoICE output flag
                                  */
-extern int     symflag;        /*      no$gmb .sym output flag
-                                */
+extern  int     symflag;        /*      no$gmb .sym output flag
+                                 */
 extern  int     xflag;          /*      Map file radix type flag
                                  */
 extern  int     pflag;          /*      print linker command file flag
@@ -701,7 +701,7 @@ extern  VOID            link_main();
 extern  VOID            lkexit();
 extern  int             main();
 extern  VOID            map();
-extern VOID            sym();
+extern  VOID            sym();
 extern  int             parse();
 extern  VOID            setbas();
 extern  VOID            setgbl();

diff --git a/as/link/mcs51/Makefile.in b/as/link/mcs51/Makefile.in
index 71e3d331b64d45490b5d87dcca1bec96e7cf4144..1d11f188c3b033941da42b1bda2060c49558eb75 100644 (file)
--- a/as/link/mcs51/Makefile.in
+++ b/as/link/mcs51/Makefile.in
@@ -7,17 +7,17 @@ VERSIONHI       = @VERSIONHI@
 VERSIONLO       = @VERSIONLO@
 VERSIONP        = @VERSIONP@
 
-SHELL          = /bin/sh
-CC             = @CC@
-CPP            = @CPP@
-INSTALL                = @INSTALL@
+SHELL           = /bin/sh
+CC              = @CC@
+CPP             = @CPP@
+INSTALL         = @INSTALL@
 STRIP           = @STRIP@
 
-top_builddir   = @top_builddir@
-top_srcdir     = @top_srcdir@
+top_builddir    = @top_builddir@
+top_srcdir      = @top_srcdir@
 
-srcdir         = @srcdir@
-prefix         = @prefix@
+srcdir          = @srcdir@
+prefix          = @prefix@
 exec_prefix     = @exec_prefix@
 bindir          = @bindir@
 libdir          = @libdir@
@@ -32,20 +32,20 @@ EXEEXT          = @EXEEXT@
 
 VPATH           = @srcdir@
 
-CPPFLAGS       = @CPPFLAGS@ -I.. -I$(srcdir)
-CFLAGS         = @CFLAGS@ -Wall -DINDEXLIB
-M_OR_MM                = @M_OR_MM@
-LDFLAGS                = @LDFLAGS@
+CPPFLAGS        = @CPPFLAGS@ -I.. -I$(srcdir)/..
+CFLAGS          = @CFLAGS@ -Wall -DINDEXLIB
+M_OR_MM         = @M_OR_MM@
+LDFLAGS         = @LDFLAGS@
 
-LKOBJECTS      = lkmain.o lkhead.o lkarea.o lkdata.o \
-                 lkeval.o lklex.o lksym.o lkrloc.o \
-                 lklibr.o lklist.o lkihx.o lks19.o \
-                 lknoice.o lkmem.o lkaomf51.o \
-                 ../lkstore.o \
-                 strcmpi.o
-LKSOURCES      = $(patsubst %.o,%.c,$(LKOBJECTS))
+LKOBJECTS       = lkmain.o lkhead.o lkarea.o lkdata.o \
+                  lkeval.o lklex.o lksym.o lkrloc.o \
+                  lklibr.o lklist.o lkihx.o lks19.o \
+                  lknoice.o lkmem.o lkaomf51.o \
+                  ../lkstore.o \
+                  strcmpi.o
+LKSOURCES       = $(patsubst %.o,%.c,$(LKOBJECTS))
 
-ASLINK         = $(top_builddir)bin/aslink$(EXEEXT)
+ASLINK          = $(top_builddir)bin/aslink$(EXEEXT)
 
 transform       = @program_transform_name@
 

diff --git a/as/link/z80/Makefile.in b/as/link/z80/Makefile.in
index 1c3367e7a8ff7dc6ab22506312aeb87647d39da3..27e59ee724b774a6ecb43dc5c3c2456df5a92c8f 100644 (file)
--- a/as/link/z80/Makefile.in
+++ b/as/link/z80/Makefile.in
@@ -14,15 +14,15 @@ SRC = lkarea.c lkdata.c lkeval.c lkhead.c lkihx.c lklex.c \
          lkgb.c lkgg.c \
          ../lkstore.c
 
-OBJS   = $(SRC:%.c=$(OBJDIR)/%.o) 
-SLIBOBJS       = $(SLIBSRC:%.c=$(OBJDIR)/%.o) 
+OBJS   = $(SRC:%.c=$(OBJDIR)/%.o)
+SLIBOBJS       = $(SLIBSRC:%.c=$(OBJDIR)/%.o)
 
 BINS   = $(BUILDDIR)link$(EXT)$(EXEEXT)
 
-CPPFLAGS+= -I..
+CPPFLAGS+= -I.. -I$(srcdir)/..
 CFLAGS += $(CPPFLAGS) $(OPTS) -DINDEXLIB -DMLH_MAP -DUNIX -DSDK
 CFLAGS += -funsigned-char -DUNIX
-CFLAGS += -I$(top_builddir)as/$(PORT) -I$(SLIB) 
+CFLAGS += -I$(top_builddir)as/$(PORT) -I$(SLIB)
 
 LDFLAGS += -lm $(EXTRALIBS)