X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=device%2Flib%2Fpic16%2FMakefile.rules;h=f3058419c827d2fb5e2f4df83c97945bc6922d74;hb=c42e9051755428d14eb620abc9eda86d43479a1a;hp=81e92e25137e048edacb89be4c74fc9311361be8;hpb=5979bbd157a5f3cd8018aed666e4dd41a3e08edf;p=fw%2Fsdcc

diff --git a/device/lib/pic16/Makefile.rules b/device/lib/pic16/Makefile.rules
index 81e92e25..f3058419 100644
--- a/device/lib/pic16/Makefile.rules
+++ b/device/lib/pic16/Makefile.rules
@@ -17,39 +17,39 @@
 ###
 
 # update dependencies
-$(topsrcdir)/$(builddir)/%.d : %.c
+$(top_builddir)$(builddir)/%.d : %.c
 ifndef SILENT
-	@echo "[  CPP  ] ==> $(patsubst $(topsrcdir)/%,%,$@)";
+	@echo "[  CPP  ] ==> $(patsubst $(top_builddir)%,%,$@)"
 endif
-	$(Q)$(CPP) $(CPPFLAGS) -o "$@" "$<";
+	$(Q)$(CPP) $(CPPFLAGS) -o "$@" "$<"
 
 # assemble
-$(topsrcdir)/$(builddir)/%.o : %.S
+$(top_builddir)$(builddir)/%.o : %.S
 ifndef SILENT
-	@echo "[  AS   ] ==> $(patsubst $(topsrcdir)/%,%,$@)";
+	@echo "[  AS   ] ==> $(patsubst $(top_builddir)%,%,$@)"
 endif
-	$(Q)$(AS) $(ASFLAGS) -o "$@" -c "$<";
+	$(Q)$(AS) $(ASFLAGS) -o "$@" -c "$<"
 
 # compile
-$(topsrcdir)/$(builddir)/%.o : %.c
+$(top_builddir)$(builddir)/%.o : %.c
 ifndef SILENT
-	@echo "[  CC   ] ==> $(patsubst $(topsrcdir)/%,%,$@)";
+	@echo "[  CC   ] ==> $(patsubst $(top_builddir)%,%,$@)"
 endif
-	$(Q)$(CC) $(CFLAGS) -o "$@" -c "$<";
+	$(Q)$(CC) $(CFLAGS) -o "$@" -c "$<"
 
 # create library
 ifneq (,$(strip $(LIB_O)))
 %.lib : $(LIB_O)
 ifndef SILENT
-	@echo "[  LIB  ] $(patsubst $(topsrcdir)/%,%,$@) <== $(patsubst $(topsrcdir)/$(builddir)/%,%,$^)";
+	@echo "[  LIB  ] $(patsubst $(top_builddir)%,%,$@) <== $(patsubst $(top_builddir)$(builddir)/%,%,$^)"
 endif
-	$(Q)$(RM) "$@"; $(LIB) $(LIBFLAGS) "$@" $^;
+	$(Q)$(RM) "$@"; $(LIB) $(LIBFLAGS) "$@" $^
 else
 %.lib : recurse
 ifndef SILENT
-	@echo "[  LIB  ] $(patsubst $(topsrcdir)/%,%,$@) <== **/*.o";
+	@echo "[  LIB  ] $(patsubst $(top_builddir)%,%,$@) <== **/*.o"
 endif
-	$(Q)$(RM) "$@"; LIB_O=`find "$(topsrcdir)/$(builddir)" -name "*.o"`; echo $${LIB_O}; [ "x$${LIB_O}" = "x" ] || $(LIB) $(LIBFLAGS) "$@" $${LIB_O};
+	$(Q)$(RM) "$@"; LIB_O=`find "$(top_builddir)$(builddir)" -name "*.o"`; echo $${LIB_O}; [ "x$${LIB_O}" = "x" ] || $(LIB) $(LIBFLAGS) "$@" $${LIB_O}
 endif
 
 .PHONY : recurse force
@@ -58,8 +58,8 @@ endif
 ifneq (,$(strip $(SUBDIRS)))
 recurse : force
 	$(Q)+for DIR in $(SUBDIRS) ; do \
-		$(GREP) "^$${ARCH}$$" "$${DIR}.ignore" &> /dev/null || ( \
-			[ -d "$(topsrcdir)/$(builddir)/$${DIR}" ] || $(MKDIR) "$(topsrcdir)/$(builddir)/$${DIR}"; \
+		$(GREP) "^$${ARCH}$$" "$(srcdir)/$${DIR}.ignore" &> /dev/null || ( \
+			$(MKDIR) "$(top_builddir)$(builddir)/$${DIR}"; \
 			$(MAKE) -C "$${DIR}" builddir="$(builddir)/$${DIR}" $(MAKECMDGOALS); \
 		) || exit 1; \
 	done