1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
Description: Avoid build tools messing with VCS or packaging
Author: Jonas Smedegaard <dr@jones.dk>
Last-Update: 2016-05-25
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/configure.ac
+++ b/configure.ac
@@ -762,9 +762,9 @@
# Collect "GIT" compile-time information to help when debugging FontForge.
FONTFORGE_GIT_VERSION=""
-if test -d ${srcdir}/.git; then
- FONTFORGE_GIT_VERSION=`cd ${srcdir} && git log --pretty=format:'%H' -n 1`
-fi
+dnl if test -d ${srcdir}/.git; then
+dnl FONTFORGE_GIT_VERSION=`cd ${srcdir} && git log --pretty=format:'%H' -n 1`
+dnl fi
FONTFORGE_DATE_NOW=${SOURCE_DATE_EPOCH:-$(date +'%s')}
FONTFORGE_DATE_OPTS="--date=@${FONTFORGE_DATE_NOW}"
if ! date --version 2>/dev/null ; then
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,6 @@
AM_CPPFLAGS =
AM_LDFLAGS =
-BUILT_SOURCES = uthash/src
EXTRA_DIST =
CLEANFILES =
MOSTLYCLEANFILES =
@@ -114,7 +113,6 @@
Packaging/FontForge-doc.spec \
Packaging/FontForge.spec \
Packaging/FontForge.static.spec \
- uthash/src \
$(NULL)
#--------------------------------------------------------------------------
@@ -127,22 +125,3 @@
# --without-libtiff --without-libxml --without-libspiro \
# --without-libuninameslist --without-libunicodenames \
# --without-libzmq --without-libreadline
-
-
-#--------------------------------------------------------------------------
-uthash/src:
- if [ ! -e uthash/src ]; then \
- if [ -e uthash ] ; then rm -r uthash ; fi ; \
- git clone https://github.com/troydhanson/uthash ; \
- fi ;
-
-# We import a selection of targets from Frank's standard packaging Makefile.
-
-# automake can't parse certain parts of Makefile syntax,
-# and there isn't an easy way to make it copy things that it doesn't
-# understand without grouching, so we use a sneaky trick, specifically
-# a blank macro from configure.ac so as to bypass evaluation.
-
-@BLANK2@-include $(top_srcdir)/pkg.mk
-
--include $(top_srcdir)/git.mk
--- a/fontforge/Makefile.am
+++ b/fontforge/Makefile.am
@@ -121,7 +121,6 @@
AM_CPPFLAGS = "-I$(top_builddir)/inc" "-I$(top_srcdir)/inc" \
"-I$(top_builddir)/lib" "-I$(top_srcdir)/lib" \
"-DSHAREDIR=\"${MY_SHAREDIR}\"" "-DDOCDIR=\"${MY_DOCDIR}\"" \
- "-I$(top_builddir)/uthash/src" "-I$(top_srcdir)/uthash/src" \
"-DFF_UTHASH_GLIF_NAMES=1" \
"-DPLUGINDIR=\"${MY_PLUGINDIR}\"" $(MY_CFLAGS)
|
