[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: pcb.git: branch: master updated (f3e5290c8a883a103a3931767bdc47d9f5181997)
The branch, master has been updated
via f3e5290c8a883a103a3931767bdc47d9f5181997 (commit)
via 1590f4c65c15e6a3ba27079866ea8d14252ce7bf (commit)
via e2e741ab7589bd3e6c925fc9b2a81c7c2121f820 (commit)
from e1d647498921eaca00b2f6930fe1ae9af0c1aab1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
configure.ac | 1 +
src/Makefile.am | 11 ++++++++++-
2 files changed, 11 insertions(+), 1 deletions(-)
=================
Commit Messages
=================
commit f3e5290c8a883a103a3931767bdc47d9f5181997
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Dan McMahill <dan@xxxxxxxxxxxx>
It is gcode/hid.conf not gcode/gcode.conf that needs to be distributed.
Also put this file in the correct sorted location.
:100644 100644 561a6f4... e719268... M src/Makefile.am
commit 1590f4c65c15e6a3ba27079866ea8d14252ce7bf
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Dan McMahill <dan@xxxxxxxxxxxx>
Add missing AC_PROG_MKDIR_P check.
:100644 100644 43ebfaf... f0e19bd... M configure.ac
commit e2e741ab7589bd3e6c925fc9b2a81c7c2121f820
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Dan McMahill <dan@xxxxxxxxxxxx>
Fix building outside of the source tree with dependency tracking
disabled. In that case some directories need to be manually
created. Fixes bug #2889226.
:100644 100644 a5441d6... 561a6f4... M src/Makefile.am
=========
Changes
=========
commit f3e5290c8a883a103a3931767bdc47d9f5181997
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Dan McMahill <dan@xxxxxxxxxxxx>
It is gcode/hid.conf not gcode/gcode.conf that needs to be distributed.
Also put this file in the correct sorted location.
diff --git a/src/Makefile.am b/src/Makefile.am
index 561a6f4..e719268 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -200,6 +200,7 @@ EXTRA_DIST= \
default_font \
$(srcdir)/hid/batch/hid.conf \
$(srcdir)/hid/bom/hid.conf \
+ $(srcdir)/hid/gcode/hid.conf \
$(srcdir)/hid/gerber/hid.conf \
$(srcdir)/hid/gtk/gui-icons-misc.data \
$(srcdir)/hid/gtk/gui-icons-mode-buttons.data \
@@ -208,7 +209,6 @@ EXTRA_DIST= \
$(srcdir)/hid/lesstif/hid.conf \
$(srcdir)/hid/lpr/hid.conf \
$(srcdir)/hid/png/hid.conf \
- $(srcdir)/hid/gcode/gcode.conf \
$(srcdir)/hid/nelma/hid.conf \
$(srcdir)/hid/ps/hid.conf \
gpcb-menu.res \
commit 1590f4c65c15e6a3ba27079866ea8d14252ce7bf
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Dan McMahill <dan@xxxxxxxxxxxx>
Add missing AC_PROG_MKDIR_P check.
diff --git a/configure.ac b/configure.ac
index 43ebfaf..f0e19bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -143,6 +143,7 @@ AC_PROG_CC_STDC
AM_PROG_CC_C_O
AC_PROG_CPP
AC_PROG_AWK
+AC_PROG_MKDIR_P
AM_PROG_LEX
AC_PATH_PROG(LEX_PATH, $LEX, [notfound])
commit e2e741ab7589bd3e6c925fc9b2a81c7c2121f820
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Dan McMahill <dan@xxxxxxxxxxxx>
Fix building outside of the source tree with dependency tracking
disabled. In that case some directories need to be manually
created. Fixes bug #2889226.
diff --git a/src/Makefile.am b/src/Makefile.am
index a5441d6..561a6f4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -233,6 +233,7 @@ gpcb-menu.h : gpcb-menu.res
echo '0};' >> $@
hid/common/hidlist.h : Makefile
+ $(MKDIR_P) hid/common
true > $@
for e in ${HIDLIST}; do \
echo "HID_DEF($${e})" >> $@; \
@@ -269,6 +270,7 @@ LIBGTK_SRCS = \
libgtk_a_SOURCES = ${LIBGTK_SRCS} hid/gtk/gtk_lists.h
hid/gtk/gtk_lists.h : ${LIBGTK_SRCS} Makefile
+ $(MKDIR_P) hid/gtk
true > $@
(for f in ${LIBGTK_SRCS} ; do cat $(srcdir)/$$f ; done) | grep "^REGISTER" > $@.tmp
mv $@.tmp $@
@@ -317,6 +319,7 @@ LIBLESSTIF_SRCS = \
liblesstif_a_SOURCES = ${LIBLESSTIF_SRCS} hid/lesstif/lesstif_lists.h
hid/lesstif/lesstif_lists.h : ${LIBLESSTIF_SRCS} Makefile
+ $(MKDIR_P) hid/lesstif
true > $@
(for f in ${LIBLESSTIF_SRCS} ; do cat $(srcdir)/$$f ; done) | grep "^REGISTER" > $@.tmp
mv $@.tmp $@
@@ -364,6 +367,7 @@ LIBGTS_SRCS = \
libgts_a_SOURCES = ${LIBGTS_SRCS} gts/gts_lists.h
gts/gts_lists.h : ${LIBGTS_SRCS} Makefile
+ $(MKDIR_P) gts
true > $@
# Uncomment out the following if/when we ever end up with REGISTER in any of the gts
# source files. For now, there aren't any and so the grep fails and make stops
@@ -377,6 +381,7 @@ LIBBATCH_SRCS = \
libbatch_a_SOURCES = ${LIBBATCH_SRCS} hid/batch/batch_lists.h
hid/batch/batch_lists.h : ${LIBBATCH_SRCS} Makefile
+ $(MKDIR_P) hid/batch
true > $@
(for f in ${LIBBATCH_SRCS} ; do cat $(srcdir)/$$f ; done) | grep "^REGISTER" > $@.tmp
mv $@.tmp $@
@@ -399,6 +404,7 @@ LIBPS_SRCS = \
libps_a_SOURCES = ${LIBPS_SRCS} hid/ps/ps_lists.h
hid/ps/ps_lists.h : ${LIBPS_SRCS} Makefile
+ $(MKDIR_P) hid/ps
true > $@
(for f in ${LIBPS_SRCS} ; do cat $(srcdir)/$$f ; done) | grep "^REGISTER" > $@.tmp
mv $@.tmp $@
@@ -412,6 +418,7 @@ LIBPNG_SRCS = \
libpng_a_SOURCES = ${LIBPNG_SRCS} hid/png/png_lists.h
hid/png/png_lists.h : ${LIBPNG_SRCS} Makefile
+ $(MKDIR_P) hid/png
true > $@
(for f in ${LIBPNG_SRCS} ; do cat $(srcdir)/$$f ; done) | grep "^REGISTER" > $@.tmp
mv $@.tmp $@
@@ -435,6 +442,7 @@ LIBGCODE_SRCS = \
libgcode_a_SOURCES = ${LIBGCODE_SRCS} hid/gcode/gcode_lists.h
hid/gcode/gcode_lists.h : ${LIBGCODE_SRCS} Makefile
+ $(MKDIR_P) hid/gcode
true > $@
(for f in ${LIBGCODE_SRCS} ; do cat $(srcdir)/$$f ; done) | grep "^REGISTER" > $@.tmp
mv $@.tmp $@
@@ -448,6 +456,7 @@ LIBNELMA_SRCS = \
libnelma_a_SOURCES = ${LIBNELMA_SRCS} hid/nelma/nelma_lists.h
hid/nelma/nelma_lists.h : ${LIBNELMA_SRCS} Makefile
+ $(MKDIR_P) hid/nelma
true > $@
(for f in ${LIBNELMA_SRCS} ; do cat $(srcdir)/$$f ; done) | grep "^REGISTER" > $@.tmp
mv $@.tmp $@
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs