X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=link%2Fz80%2FMakefile.in;h=e51841862da8bd04ebdbcd4aa9a4166ecc8585df;hb=f1c40004ae349f7cd3a1a5c5c85f62f695196370;hp=467a53af4d533fe1d7bab4cf4b171dbd92a697c5;hpb=24d36cacbba9c00046134de17afd35900366150b;p=fw%2Fsdcc

diff --git a/link/z80/Makefile.in b/link/z80/Makefile.in
index 467a53af..e5184186 100644
--- a/link/z80/Makefile.in
+++ b/link/z80/Makefile.in
@@ -14,46 +14,52 @@ INSTALL		= @INSTALL@
 
 PRJDIR		= ../..
 
+EXEEXT          = @EXEEXT@
+
 srcdir		= @srcdir@
 prefix		= @prefix@
-exec_prefix     = ${prefix}
-bindir          = ${exec_prefix}/bin
-libdir          = ${exec_prefix}/lib
-datadir         = ${prefix}/share
-includedir      = ${prefix}/include
-mandir          = ${prefix}/man
+exec_prefix     = @exec_prefix@
+bindir          = @bindir@
+libdir          = @libdir@
+datadir         = @datadir@
+includedir      = @includedir@
+mandir          = @mandir@
 man1dir         = $(mandir)/man1
 man2dir         = $(mandir)/man2
-infodir         = ${prefix}/info
+infodir         = @infodir@
+
+SLIB	=$(PRJDIR)/support/Util
 
-CPPFLAGS	= @CPPFLAGS@ -I. -I$(PRJDIR) -I$(PRJDIR)/as/z80
+CPPFLAGS	= @CPPFLAGS@ -I. -I$(PRJDIR) -I$(PRJDIR)/as/z80 -I$(SLIB)
 CFLAGS		= @CFLAGS@ -Wall -DINDEXLIB -DMLH_MAP -DUNIX -DSDK -DSDK_VERSION_STRING="\"3.0.0\"" -DTARGET_STRING="\"gbz80\"" -funsigned-char
 M_OR_MM		= @M_OR_MM@
 LDFLAGS		= @LDFLAGS@ -lm
 
+SLIBOBJS	= NewAlloc.o
+
 LKOBJECTS	= lkarea.o lkdata.o lkeval.o lkhead.o lkihx.o lklex.o \
 		  lklibr.o lklist.o lkmain.o lkrloc.o lks19.o lksym.o \
 		  lkgb.o lkgg.o 
 LKSOURCES	= $(patsubst %.o,%.c,$(LKOBJECTS))
 
-LKZ80		= $(PRJDIR)/bin/link-z80
+LKZ80		= $(PRJDIR)/bin/link-z80$(EXEEXT)
 
 # Compiling entire program or any subproject
 # ------------------------------------------
 all: checkconf $(LKZ80)
 
-$(LKZ80): $(LKOBJECTS)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LKOBJECTS) 
+$(LKZ80): $(SLIBOBJS) $(LKOBJECTS)
+	$(CC) $(CFLAGS) -o $@ $(SLIBOBJS) $(LKOBJECTS) $(LDFLAGS)
 
 # Compiling and installing everything and runing test
 # ---------------------------------------------------
 install: all installdirs
-	$(INSTALL) -s $(LKZ80) $(bindir)/link-z80
+	$(INSTALL) $(LKZ80) $(DESTDIR)$(bindir)/link-z80$(EXEEXT)
 
 # Deleting all the installed files
 # --------------------------------
 uninstall:
-	rm -f $(bindir)/link-z80
+	rm -f $(DESTDIR)$(bindir)/link-z80$(EXEEXT)
 
 
 # Performing self-test
@@ -69,7 +75,7 @@ installcheck:
 # Creating installation directories
 # ---------------------------------
 installdirs:
-	$(INSTALL) -d $(bindir)
+	$(INSTALL) -d $(DESTDIR)$(bindir)
 
 
 # Creating dependencies
@@ -87,6 +93,8 @@ include clean.mk
 .c.o:
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
+$(SLIBOBJS):%.o:$(SLIB)/%.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
 
 # Remaking configuration
 # ----------------------