Imported Upstream version 6.0.0upstream/6.0.0

1 files changed, 21 insertions, 14 deletions

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