X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=device%2Flib%2Fpic16%2FMakefile.rules;h=9acdbc32568819e12699d783669434fdeeec3c21;hb=d25410272593de279e84cf891961c535b8c7fc70;hp=f0f9fef6f8361e3eb54abe98dfb9b35cba79d6e3;hpb=249f3b9ab24db32c0496869c84a75518af44f407;p=fw%2Fsdcc diff --git a/device/lib/pic16/Makefile.rules b/device/lib/pic16/Makefile.rules index f0f9fef6..9acdbc32 100644 --- a/device/lib/pic16/Makefile.rules +++ b/device/lib/pic16/Makefile.rules @@ -17,23 +17,23 @@ ### # update dependencies -$(top_builddir)$(builddir)/%.d : %.c +$(top_builddir)/$(builddir)/%.d : %.c ifndef SILENT - @echo "[ CPP ] ==> $(patsubst $(top_builddir)%,%,$@)" + @echo "[ CPP ] ==> $(patsubst $(top_builddir)/%,%,$@)" endif $(Q)$(CPP) $(CPPFLAGS) -o "$@" "$<" # assemble -$(top_builddir)$(builddir)/%.o : %.S +$(top_builddir)/$(builddir)/%.o : %.S ifndef SILENT - @echo "[ AS ] ==> $(patsubst $(top_builddir)%,%,$@)" + @echo "[ AS ] ==> $(patsubst $(top_builddir)/%,%,$@)" endif $(Q)$(AS) $(ASFLAGS) -o "$@" -c "$<" # compile -$(top_builddir)$(builddir)/%.o : %.c +$(top_builddir)/$(builddir)/%.o : %.c ifndef SILENT - @echo "[ CC ] ==> $(patsubst $(top_builddir)%,%,$@)" + @echo "[ CC ] ==> $(patsubst $(top_builddir)/%,%,$@)" endif $(Q)$(CC) $(CFLAGS) -o "$@" -c "$<" @@ -41,16 +41,16 @@ endif ifneq (,$(strip $(LIB_O))) %.lib : $(LIB_O) ifndef SILENT - @echo "[ LIB ] $(patsubst $(top_builddir)%,%,$@) <== $(patsubst $(top_builddir)$(builddir)/%,%,$^)" + @echo "[ LIB ] $(patsubst $(top_builddir)/%,%,$@) <== $(patsubst $(top_builddir)/$(builddir)/%,%,$^)" endif $(Q)$(RM) "$@"; $(LIB) $(LIBFLAGS) "$@" $^ else %.lib : recurse ifndef SILENT - @echo "[ LIB ] $(patsubst $(top_builddir)%,%,$@) <== **/*.o" - $(Q)$(RM) "$@"; LIB_O=`find "$(top_builddir)$(builddir)" -name "*.o"`; echo $${LIB_O}; [ "x$${LIB_O}" = "x" ] || $(LIB) $(LIBFLAGS) "$@" $${LIB_O} + @echo "[ LIB ] $(patsubst $(top_builddir)/%,%,$@) <== **/*.o" + $(Q)$(RM) "$@"; LIB_O=`find "$(top_builddir)/$(builddir)" -name "*.o"`; echo $${LIB_O}; [ "x$${LIB_O}" = "x" ] || $(LIB) $(LIBFLAGS) "$@" $${LIB_O} else - $(Q)$(RM) "$@"; LIB_O=`find "$(top_builddir)$(builddir)" -name "*.o"`; [ "x$${LIB_O}" = "x" ] || $(LIB) $(LIBFLAGS) "$@" $${LIB_O} + $(Q)$(RM) "$@"; LIB_O=`find "$(top_builddir)/$(builddir)" -name "*.o"`; [ "x$${LIB_O}" = "x" ] || $(LIB) $(LIBFLAGS) "$@" $${LIB_O} endif endif @@ -61,7 +61,7 @@ ifneq (,$(strip $(SUBDIRS))) recurse : force $(Q)+for DIR in $(SUBDIRS) ; do \ $(GREP) "^$${ARCH}$$" "$(srcdir)/$${DIR}.ignore" &> /dev/null || ( \ - $(MKDIR) "$(top_builddir)$(builddir)/$${DIR}"; \ + $(MKDIR) "$(top_builddir)/$(builddir)/$${DIR}"; \ $(MAKE) -C "$${DIR}" builddir="$(builddir)/$${DIR}" $(MAKECMDGOALS); \ ) || exit 1; \ done