|
Lines 1-11
Link Here
|
| 1 |
--- Makefile.am.orig 2015-01-31 19:29:34 UTC |
1 |
--- Makefile.am.orig 2015-07-02 13:50:20 UTC |
| 2 |
+++ Makefile.am |
2 |
+++ Makefile.am |
| 3 |
@@ -2,7 +2,7 @@ |
3 |
@@ -1,8 +1,8 @@ |
|
|
4 |
# Makefile.am - Top level automakefile for libspiro |
| 4 |
|
5 |
|
| 5 |
SUBDIRS = . tests |
6 |
-SUBDIRS = . tests |
|
|
7 |
+SUBDIRS = . |
| 6 |
|
8 |
|
| 7 |
-pkgconfigdir = $(libdir)/pkgconfig |
9 |
-pkgconfigdir = $(libdir)/pkgconfig |
| 8 |
+pkgconfigdir = ${PREFIX}/libdata/pkgconfig |
10 |
+pkgconfigdir = ${PREFIX}/libdata/pkgconfig |
| 9 |
pkgconfig_DATA = libspiro.pc |
11 |
pkgconfig_DATA = libspiro.pc |
| 10 |
|
12 |
|
| 11 |
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} |
13 |
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} |
|
|
14 |
@@ -13,7 +13,7 @@ AM_LDFLAGS = $(WLSLIB) $(LS_LIB) -no-und |
| 15 |
LIBTOOL_DEPS = @LIBTOOL_DEPS@ |
| 16 |
|
| 17 |
DISTCLEANFILES = libspiro.pc |
| 18 |
-DISTCHECK_CONFIGURE_FLAGS = --enable-verbose_lib --enable-test_inputs |
| 19 |
+DISTCHECK_CONFIGURE_FLAGS = --enable-verbose_lib --disable-test_inputs |
| 20 |
|
| 21 |
lib_LTLIBRARIES = libspiro.la |
| 22 |
|
| 23 |
@@ -26,17 +26,10 @@ EXTRA_DIST = bezctx.md get-spiro-src.sh |
| 24 |
java/ShowPlate.java java/Spiro.java java/SpiroBezierContext.java \ |
| 25 |
java/SpiroCanvas.java java/SpiroCP.java java/SpiroGeneralPath.java \ |
| 26 |
java/SpiroPointType.java README-GeorgeWilliams fontforge-debug.txt \ |
| 27 |
- fontforge.sh m4/ax_check_compile_flag.m4 tests/call-test.c |
| 28 |
+ fontforge.sh m4/ax_check_compile_flag.m4 |
| 29 |
|
| 30 |
include_HEADERS = bezctx.h bezctx_intf.h spiro.h spiroentrypoints.h |
| 31 |
|
| 32 |
libtool: $(LIBTOOL_DEPS) |
| 33 |
$(SHELL) ./config.status libtool |
| 34 |
|
| 35 |
-# test: run all tests in cwd and subdirs |
| 36 |
-test: ${TEST_PROGS} |
| 37 |
- |
| 38 |
-.PHONY: test |
| 39 |
-# run make test as part of make check |
| 40 |
-check-local: test |
| 41 |
- |