+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,
/*
* 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
/*
*/
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
extern VOID lkexit();
extern int main();
extern VOID map();
-extern VOID sym();
+extern VOID sym();
extern int parse();
extern VOID setbas();
extern VOID setgbl();
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@
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@
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)