From 5e01a4852b31d537307994248869caf38b4023cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Tue, 10 May 2016 05:12:17 +0200
Subject: Imported Upstream version 6.0.0

---
 sample/Makefile.am | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

(limited to 'sample/Makefile.am')

diff --git a/sample/Makefile.am b/sample/Makefile.am
index af33057..53f0d08 100644
--- a/sample/Makefile.am
+++ b/sample/Makefile.am
@@ -1,8 +1,14 @@
-noinst_PROGRAMS = encode listcap names posix simple sql syntax crnl
+#noinst_PROGRAMS = encode listcap names posix simple sql syntax crnl
 
-libname = $(top_builddir)/libonig.la
-LDADD   = $(libname)
-INCLUDES  = -I$(top_srcdir) -I$(includedir)
+lib_onig = ../src/libonig.la
+LDADD  = $(lib_onig)
+
+AM_LDFLAGS  = -L$(prefix)/lib
+AM_CPPFLAGS = -I../src -I$(includedir)
+
+TESTS = encode listcap names posix simple sql syntax user_property
+
+check_PROGRAMS = encode listcap names posix simple sql syntax user_property
 
 encode_SOURCES  = encode.c
 listcap_SOURCES = listcap.c
@@ -11,15 +17,16 @@ posix_SOURCES   = posix.c
 simple_SOURCES  = simple.c
 sql_SOURCES     = sql.c
 syntax_SOURCES  = syntax.c
+user_property_SOURCES = user_property.c
 
+sampledir = .
 
-sampledir = $(top_builddir)/sample
-
-test: encode listcap names posix simple sql syntax
-	@$(sampledir)/encode
-	@$(sampledir)/listcap
-	@$(sampledir)/names
-	@$(sampledir)/posix
-	@$(sampledir)/simple
-	@$(sampledir)/sql
-	@$(sampledir)/syntax
+test: encode listcap names posix simple sql syntax user_property
+	$(sampledir)/encode
+	$(sampledir)/listcap
+	$(sampledir)/names
+	$(sampledir)/posix
+	$(sampledir)/simple
+	$(sampledir)/sql
+	$(sampledir)/syntax
+	$(sampledir)/user_property
-- 
cgit v1.2.3