From: Oliver Schmidt <ol.sc@web.de>
Date: Tue, 4 Mar 2014 20:45:55 +0000 (+0100)
Subject: Changed Makefile.inc handling.
X-Git-Tag: V2.15~131
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=44ccb27549ffcf78f559cfa4fb252a45f94b310b;p=cc65

Changed Makefile.inc handling.

It seems more appropriate to trigger the inclusion of Makefile.inc via $TARGET (instead of $SRCDIR). This is btw. more consistent with extzp.s inclusion which is triggered via $TARGET too.
---

diff --git a/libsrc/Makefile b/libsrc/Makefile
index 99da96f1e..19fb5ac3f 100644
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -99,10 +99,12 @@ EXTZP = cbm510 \
 
 MKINC = $(GEOS) \
         atari   \
+        atarixl \
         nes
 
-TARGETUTIL = apple2 \
-             atari \
+TARGETUTIL = apple2    \
+             apple2enh \
+             atari     \
              geos-apple
 
 GEOSDIRS = common      \
@@ -173,11 +175,11 @@ ifeq ($(TARGET),$(filter $(TARGET),$(EXTZP)))
   ZPOBJ += ../wrk/$(TARGET)/extzp.o
 endif
 
-ifeq ($(SRCDIR),$(filter $(SRCDIR),$(MKINC)))
+ifeq ($(TARGET),$(filter $(TARGET),$(MKINC)))
   include $(SRCDIR)/Makefile.inc
 endif
 
-ifeq ($(SRCDIR),$(filter $(SRCDIR),$(TARGETUTIL)))
+ifeq ($(TARGET),$(filter $(TARGET),$(TARGETUTIL)))
   include $(SRCDIR)/targetutil/Makefile.inc
 endif
 
diff --git a/libsrc/atari/targetutil/Makefile.inc b/libsrc/atari/targetutil/Makefile.inc
index fc91f96a9..01b5e7507 100644
--- a/libsrc/atari/targetutil/Makefile.inc
+++ b/libsrc/atari/targetutil/Makefile.inc
@@ -1,5 +1,3 @@
-ifeq ($(TARGET),atari)
-
 DEPS += ../wrk/$(TARGET)/w2cas.d
 
 ../wrk/$(TARGET)/w2cas.o: $(SRCDIR)/targetutil/w2cas.c | ../wrk/$(TARGET)
@@ -9,5 +7,3 @@ DEPS += ../wrk/$(TARGET)/w2cas.d
 	$(LD65) -o $@ -t $(TARGET) $^
 
 $(TARGET): ../targetutil/w2cas.com
-
-endif
diff --git a/src/cl65/main.c b/src/cl65/main.c
index 0c460eec9..7c8149660 100644
--- a/src/cl65/main.c
+++ b/src/cl65/main.c
@@ -51,7 +51,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
-#ifdef HAVE_SPAWN
+#if defined(HAVE_SPAWN)
 #  include <process.h>
 #endif