X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=as%2Fhc08%2FMakefile.in;h=65ab660f849df243e231a3460ee738d133ccfdf1;hb=48c64f59592c39f8ffc9dbd6f10ed79f046841a3;hp=bb615d2c06aa8844e3efcc6da3bb54dd9ba0c5a5;hpb=d25410272593de279e84cf891961c535b8c7fc70;p=fw%2Fsdcc

diff --git a/as/hc08/Makefile.in b/as/hc08/Makefile.in
index bb615d2c..65ab660f 100644
--- a/as/hc08/Makefile.in
+++ b/as/hc08/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@
@@ -33,23 +33,34 @@ EXEEXT          = @EXEEXT@
 
 VPATH           = @srcdir@
 
-CPPFLAGS	= @CPPFLAGS@ -I. -I$(srcdir)
-CFLAGS		= @CFLAGS@ -Wall
-M_OR_MM		= @M_OR_MM@
-LDFLAGS		= @LDFLAGS@
+CPPFLAGS        = @CPPFLAGS@ -I. -I$(srcdir)
+CFLAGS          = @CFLAGS@ -Wall -I. -I$(srcdir)
+M_OR_MM         = @M_OR_MM@
+LDFLAGS         = @LDFLAGS@
 
-ASOBJECTS	= asmain.o aslex.o assym.o assubr.o asnoice.o \
-		  asexpr.o asdata.o aslist.o asout.o asstore.o \
-		  m08ext.o m08pst.o m08mch.o m08adr.o strcmpi.o
-ASSOURCES	= $(patsubst %.o,%.c,$(ASOBJECTS))
+OBJDIR = obj
 
-ASHC08		= $(top_builddir)/bin/as-hc08$(EXEEXT)
+ASXXLIB = $(srcdir)/../asxxsrc
+
+ASXXLIBSRC = strcmpi.c assym.c aslex.c
+
+SRC = asmain.c assubr.c asnoice.c \
+      asexpr.c asdata.c aslist.c asout.c \
+      m08ext.c m08pst.c m08mch.c m08adr.c
+
+ASSOURCES = %(SRC) $(ASXXLIBSRC:%.c=$(ASXXLIB)/%.c)
+                  
+OBJS = $(SRC:%.c=$(OBJDIR)/%.o)
+ASXXLIBOBJS = $(ASXXLIBSRC:%.c=$(OBJDIR)/%.o)
+ASOBJECTS = $(OBJS) $(ASXXLIBOBJS)
+
+ASHC08 = $(top_builddir)/bin/as-hc08$(EXEEXT)
 
 transform       = @program_transform_name@
 
 # Compiling entire program or any subproject
 # ------------------------------------------
-all: checkconf $(ASHC08) $(ASLINK)
+all: checkconf $(ASHC08)
 
 $(ASHC08): $(ASOBJECTS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ASOBJECTS) 
@@ -86,19 +97,26 @@ installdirs:
 # ---------------------
 dep: Makefile.dep
 
-Makefile.dep: $(ASSOURCES) $(srcdir)/*.h $(top_builddir)/*.h $(top_srcdir)/*.h
+Makefile.dep: $(ASSOURCES) $(srcdir)/*.h
 	$(CPP) $(CPPFLAGS) $(M_OR_MM) $(filter %.c,$^) >Makefile.dep
 
 ifeq "$(findstring $(MAKECMDGOALS),uninstall check installcheck installdirs \
                                    clean distclean mostlyclean realclean)" ""
-  include Makefile.dep
+  -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 $@ $<
 
 
 # Remaking configuration