X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=device%2Flib%2Fpic%2FMakefile.subdir;h=661790c1dab88d1d80ff72122652d15fe0d6d42c;hb=1bb6a9b476754a7dd750c60972bbefe75c218f68;hp=9ed0edf5e1a65afb98b781e134cdc07981ea1396;hpb=4fa52c899d3553b51d56db35d035f17b7e22e66b;p=fw%2Fsdcc

diff --git a/device/lib/pic/Makefile.subdir b/device/lib/pic/Makefile.subdir
index 9ed0edf5..661790c1 100644
--- a/device/lib/pic/Makefile.subdir
+++ b/device/lib/pic/Makefile.subdir
@@ -12,7 +12,7 @@
 ### $Id$
 ###
 
-include $(top_builddir)Makefile.common
+include $(top_builddir)/Makefile.common
 
 SUBDIRS ?= 
 MKLIB	?= 
@@ -22,12 +22,12 @@ builddir ?= build/$(patsubst $(shell cd $(top_srcdir); pwd)/%,%,$(CURDIR))
 
 C_SRC	?= $(notdir $(wildcard $(srcdir)/*.c))
 S_SRC	?= $(notdir $(wildcard $(srcdir)/*.S))
-OBJS	?= $(addprefix $(top_builddir)$(builddir)/,$(C_SRC:%.c=%.o) $(S_SRC:%.S=%.o))
+OBJS	?= $(addprefix $(top_builddir)/$(builddir)/,$(C_SRC:%.c=%.o) $(S_SRC:%.S=%.o))
 
 LIB_O	?= $(OBJS)
 
 ifneq (,$(strip $(MKLIB)))
-LIB_LIB = $(top_builddir)$(builddir)/$(MKLIB)
+LIB_LIB = $(top_builddir)/$(builddir)/$(MKLIB)
 TARGETS ?= $(LIB_LIB)
 else
 LIB_LIB = 
@@ -41,11 +41,11 @@ all : install
 ifneq (,$(strip $(TARGETS)))
 # usually install $(LIB_LIB) or $(OBJS), race condition in "[ -d x ] || mkdir x"
 install : recurse $(OBJS) $(LIB_LIB)
-	-@$(MKDIR) "$(top_builddir)$(installdir)"
+	-@$(MKDIR) "$(top_builddir)/$(installdir)"
 ifndef SILENT
-	@echo "[INSTALL] $(patsubst $(top_builddir)$(builddir)/%,%,$(TARGETS))"
+	@echo "[INSTALL] $(patsubst $(top_builddir)/$(builddir)/%,%,$(TARGETS))"
 endif
-	$(Q)$(CP) $(TARGETS) "$(top_builddir)$(installdir)"
+	$(Q)$(CP) $(TARGETS) "$(top_builddir)/$(installdir)"
 else
 # used in subdirs like libc/ctype whose files
 # are contained in a parent's library
@@ -58,8 +58,11 @@ clean : recurse
 	@-echo "dummy" > .dummy
 	$(Q)-$(RM) .dummy $(OBJS) $(LIB_LIB)
 	$(Q)-$(RM) $(TARGETS)
-	$(Q)-$(RM) $(addprefix $(top_builddir)$(installdir)/,$(notdir $(TARGETS)))
-	$(Q)-[ ! -d "$(top_builddir)$(builddir)" ] || $(RMDIR) "$(top_builddir)$(builddir)"
+	$(Q)-$(RM) $(addprefix $(top_builddir)/$(installdir)/,$(notdir $(TARGETS)))
+	$(Q)-[ ! -d "$(top_builddir)/$(builddir)" ] || $(RMDIR) "$(top_builddir)/$(builddir)"
+
+distclean : clean
+	$(Q)-$(RM) Makefile
 
 clean-intermediate : recurse
 	@-echo "dummy" > .dummy