This is an automated email from Gerrit.
Paul Fertser (fercer...@gmail.com) just uploaded a new patch set to Gerrit,
which you can find at http://openocd.zylin.com/2367
-- gerrit
commit 2b560e6160ad637ee606dd26be2f9c95ec235752
Author: Paul Fertser <fercer...@gmail.com>
Date: Thu Oct 30 21:28:30 2014 +0300
Makefile: support BSD make
This is ugly but I couldn't find a way that would be both GNU Make and
BSD make compatible.
Tested on FreeBSD 10.0-RELEASE #0 r260789.
Change-Id: I542d08c3967f372dc9bb4e905e943d95054eb211
Tested-by: Marc Schink <z...@irc.freenode.net>
Signed-off-by: Paul Fertser <fercer...@gmail.com>
diff --git a/Makefile.am b/Makefile.am
index 2ddc96d..0d27646 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,14 +39,14 @@ libtool: $(LIBTOOL_DEPS)
docs: pdf html doxygen
Doxyfile: $(srcdir)/Doxyfile.in
- @echo "Creating $@ from $<..."
+ @echo "Creating $@ from $(srcdir)/Doxyfile.in..."
@( \
echo "### @@@ -= DO NOT EDIT THIS FILE =- @@@ ###" && \
echo "### @@@ Make changes to Doxyfile.in @@@ ###" && \
sed -e 's,@srcdir\@,$(srcdir),' \
-e 's,@builddir\@,$(builddir),' \
-e 's,@doxygen_as_html\@,$(doxygen_as_html),' \
- -e 's,@doxygen_as_pdf\@,$(doxygen_as_pdf),' $< \
+ -e 's,@doxygen_as_pdf\@,$(doxygen_as_pdf),' $(srcdir)/Doxyfile.in \
) > $@
THE_MANUAL = doxygen/latex/refman.pdf
diff --git a/src/Makefile.am b/src/Makefile.am
index 7d67e3d..c77da47 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -88,13 +88,13 @@ EXTRA_DIST = $(STARTUP_TCL_SRCS)
BUILT_SOURCES = startup_tcl.inc
startup.tcl: $(STARTUP_TCL_SRCS)
- cat $^ > $@
+ cat $(STARTUP_TCL_SRCS) > $@
BIN2C = $(top_srcdir)/src/helper/bin2char.sh
# Convert .tcl to c-array
startup_tcl.inc: startup.tcl $(BIN2C)
- $(BIN2C) < $< > $@ || { rm -f $@; false; }
+ $(BIN2C) < startup.tcl > $@ || { rm -f $@; false; }
# add generated files to make clean list
CLEANFILES = startup.tcl startup_tcl.inc
diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index db3e6ff..0f3fce1 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -28,7 +28,7 @@ endif
MINIDRIVER_IMP_DIR = $(srcdir)/minidriver
jtag_minidriver.h: $(JTAG_MINIDRIVER_DIR)/jtag_minidriver.h
- cp $< $@
+ cp $(JTAG_MINIDRIVER_DIR)/jtag_minidriver.h $@
BUILT_SOURCES += jtag_minidriver.h
@@ -58,7 +58,7 @@ endif
# endif // MINIDRIVER
minidriver_imp.h: $(MINIDRIVER_IMP_DIR)/minidriver_imp.h
- cp $< $@
+ cp $(MINIDRIVER_IMP_DIR)/minidriver_imp.h $@
libjtag_la_SOURCES = \
diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index bf80c64..6977079 100644
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -21,7 +21,7 @@ BUILT_SOURCES = $(DEBUG_HEADER)
CLEANFILES = $(DEBUG_HEADER)
$(DEBUG_HEADER): $(DEBUG_HANDLER) $(BIN2C)
- $(BIN2C) < $< > $@ || { rm -f $@; false; }
+ $(BIN2C) < $(DEBUG_HANDLER) > $@ || { rm -f $@; false; }
METASOURCES = AUTO
noinst_LTLIBRARIES = libtarget.la
--
------------------------------------------------------------------------------
_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel
