X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=as%2Fmcs51%2FMakefile.in;h=efcdd5d6208ba0844dd2b210897cd68352492345;hb=949cd7869a69c75c59aa1533832221638b218749;hp=deba2e2938e359d633c3ce04498a83381d9e6cbc;hpb=4f55a7a15b25a7fb5435ef639c936459cd12075d;p=fw%2Fsdcc

diff --git a/as/mcs51/Makefile.in b/as/mcs51/Makefile.in
index deba2e29..efcdd5d6 100644
--- a/as/mcs51/Makefile.in
+++ b/as/mcs51/Makefile.in
@@ -7,69 +7,77 @@ 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@
 
-PRJDIR		= ../..
+top_builddir    = @top_builddir@
+top_srcdir      = @top_srcdir@
 
-srcdir		= @srcdir@
-prefix		= @prefix@
+srcdir          = @srcdir@
+prefix          = @prefix@
 exec_prefix     = @exec_prefix@
 bindir          = @bindir@
 libdir          = @libdir@
 datadir         = @datadir@
+datarootdir     = @datarootdir@
 includedir      = @includedir@
 mandir          = @mandir@
 man1dir         = $(mandir)/man1
 man2dir         = $(mandir)/man2
 infodir         = @info@
 
-CPPFLAGS	= @CPPFLAGS@ -I. -I$(PRJDIR)
-CFLAGS		= @CFLAGS@ -Wall
-M_OR_MM		= @M_OR_MM@
-LDFLAGS		= @LDFLAGS@
+EXEEXT          = @EXEEXT@
 
-ASOBJECTS	= asmain.o aslex.o assym.o assubr.o asnoice.o \
-		  asexpr.o asdata.o aslist.o asout.o asstore.o \
-		  i51ext.o i51pst.o i51mch.o i51adr.o    
-ASSOURCES	= $(patsubst %.o,%.c,$(ASOBJECTS))
+VPATH           = @srcdir@
 
-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 \
-		  lkstore.o lknoice.o lkmem.o lkomf51.o
-LKSOURCES	= $(patsubst %.o,%.c,$(LKOBJECTS))
+CPPFLAGS        = @CPPFLAGS@ -I. -I$(srcdir)
+CFLAGS          = @CFLAGS@ -Wall -DINDEXLIB -I. -I$(srcdir) -I$(srcdir)/../../support/Util
+M_OR_MM         = @M_OR_MM@
+LDFLAGS         = @LDFLAGS@
 
-ASX8051		= $(PRJDIR)/bin/asx8051
-ASLINK		= $(PRJDIR)/bin/aslink
+OBJDIR = obj
+
+UTILLIB = $(srcdir)/../../support/Util
+UTILSRC = dbuf.c dbuf_string.c
+UTILLIBOBJS = $(UTILSRC:%.c=$(OBJDIR)/%.o)
+
+ASXXLIB = $(srcdir)/../asxxsrc
+ASXXLIBSRC = strcmpi.c assym.c aslex.c asnoice.c
+ASXXLIBOBJS = $(ASXXLIBSRC:%.c=$(OBJDIR)/%.o)
+
+SRC = asmain.c assubr.c \
+      asexpr.c asdata.c aslist.c asout.c \
+      i51ext.c i51pst.c i51mch.c i51adr.c
+OBJS = $(SRC:%.c=$(OBJDIR)/%.o)
+
+ASSOURCES = $(SRC) $(ASXXLIBSRC:%.c=$(ASXXLIB)/%.c) $(UTILSRC:%.c=$(UTILLIB)/%.c)
+
+ASOBJECTS = $(OBJS) $(ASXXLIBOBJS) $(UTILLIBOBJS)
+
+ASX8051 = $(top_builddir)/bin/asx8051$(EXEEXT)
 
 transform       = @program_transform_name@
 
 # Compiling entire program or any subproject
 # ------------------------------------------
-all: checkconf $(ASX8051) $(ASLINK)
+all: checkconf $(ASX8051)
 
 $(ASX8051): $(ASOBJECTS)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ASOBJECTS) 
-
-$(ASLINK): $(LKOBJECTS)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LKOBJECTS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ASOBJECTS)
 
-# Compiling and installing everything and runing test
-# ---------------------------------------------------
+# Compiling and installing everything and running test
+# ----------------------------------------------------
 install: all installdirs
-	$(INSTALL) $(ASX8051) `echo $(bindir)/asx8051|sed '$(transform)'`
-	$(STRIP) `echo $(bindir)/asx8051|sed '$(transform)'`
-	$(INSTALL) $(ASLINK) `echo $(bindir)/aslink|sed '$(transform)'`
-	$(STRIP) `echo $(bindir)/aslink|sed '$(transform)'`
+	$(INSTALL) $(ASX8051) `echo $(DESTDIR)$(bindir)/asx8051$(EXEEXT)|sed '$(transform)'`
+	$(STRIP) `echo $(DESTDIR)$(bindir)/asx8051$(EXEEXT)|sed '$(transform)'`
 
 # Deleting all the installed files
 # --------------------------------
 uninstall:
-	rm -f $(bindir)/asx8051 $(bindir)/aslink
+	rm -f $(DESTDIR)$(bindir)/asx8051$(EXEEXT)
 
 
 # Performing self-test
@@ -85,30 +93,43 @@ installcheck:
 # Creating installation directories
 # ---------------------------------
 installdirs:
-	$(INSTALL) -d $(bindir)
+	$(INSTALL) -d $(DESTDIR)$(bindir)
 
 
 # Creating dependencies
 # ---------------------
 dep: Makefile.dep
 
-Makefile.dep: $(ASSOURCES) $(LKSOURCES) *.h $(PRJDIR)/*.h
-	$(CPP) $(CPPFLAGS) $(M_OR_MM) $(ASSOURCES) $(LKSOURCES) >Makefile.dep
+Makefile.dep: $(ASSOURCES) $(srcdir)/*.h
+	$(CPP) $(CPPFLAGS) $(M_OR_MM) $(filter %.c,$^) >Makefile.dep
 
-include Makefile.dep
-include clean.mk
+ifeq "$(findstring $(MAKECMDGOALS),uninstall check installcheck installdirs \
+                                   clean distclean mostlyclean realclean)" ""
+  -include Makefile.dep
+endif
+include $(srcdir)/clean.mk
 
 # My rules
 # --------
-.c.o:
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+$(OBJDIR)/.stamp:
+	mkdir -p $(OBJDIR)
+	touch $(OBJDIR)/.stamp
+
+$(OBJDIR)/%.o: %.c $(OBJDIR)/.stamp
+	$(CC) -c $(CFLAGS) -o $@ $<
+
+$(OBJDIR)/%.o: $(ASXXLIB)/%.c $(OBJDIR)/.stamp
+	$(CC) -c $(CFLAGS) -o $@ $<
+
+$(OBJDIR)/%.o: $(UTILLIB)/%.c $(OBJDIR)/.stamp
+	$(CC) -c $(CFLAGS) -o $@ $<
 
 
 # Remaking configuration
 # ----------------------
 checkconf:
-	@if [ -f $(PRJDIR)/devel ]; then\
-          $(MAKE) -f conf.mk srcdir="$(srcdir)" PRJDIR="$(PRJDIR)" freshconf;\
+	@if [ -f $(top_builddir)/devel ]; then\
+          $(MAKE) -f conf.mk srcdir="$(srcdir)" top_builddir="$(top_builddir)" freshconf;\
         fi
 
 # End of Makefile