Remove extra files and make travis do the install (#248)

cisco · Apr 19, 2019 · 5b99734 · 5b99734
1 parent 9e10e61
commit 5b99734
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,5 +14,6 @@ script:
     - ./configure --enable-gzip
     - make clean
     - make
+    - make install DESTDIR=/tmp/joyinstall prefix=/tmp/joy
     - bin/unit_test
     - test/run_tests.py
diff --git a/lib/Makefile.am b/lib/Makefile.am
@@ -80,9 +80,8 @@ libjoy_la_SOURCES = \
 		../src/include/utils.h \
 		../src/include/fp.h \
 		../src/include/extractor.h \
-		../src/include/wht.h \
-		../src/include/fp.h \
-		../src/include/extractor.h
+		../src/include/wht.h 
+
 else
 libjoy_la_SOURCES = \
 	../src/joy_api.c \
@@ -163,9 +162,7 @@ libjoy_la_SOURCES = \
 		../src/include/utils.h \
 		../src/include/fp.h \
 		../src/include/extractor.h \
-		../src/include/wht.h \
-		../src/include/fp.h \
-		../src/include/extractor.h
+		../src/include/wht.h 
 endif
 
 libjoy_la_CFLAGS = -I ../src/include -I $(SSL_CFLAGS) $(AM_CFLAGS) -I $(SAFEC_DIR)/include -I $(SAFEC_DIR)/include/safec
@@ -213,9 +210,8 @@ library_include_HEADERS= \
 		../src/include/utils.h \
 		../src/include/fp.h \
 		../src/include/extractor.h \
-		../src/include/wht.h \
-		../src/include/fp.h \
-		../src/include/extractor.h
+		../src/include/wht.h 
+
 
 
 if BUILD_WITH_SAFEC

diff --git a/lib/Makefile.in b/lib/Makefile.in
@@ -513,9 +513,7 @@ lib_LTLIBRARIES = libjoy.la
 @BUILD_WITH_SAFEC_FALSE@		../src/include/utils.h \
 @BUILD_WITH_SAFEC_FALSE@		../src/include/fp.h \
 @BUILD_WITH_SAFEC_FALSE@		../src/include/extractor.h \
-@BUILD_WITH_SAFEC_FALSE@		../src/include/wht.h \
-@BUILD_WITH_SAFEC_FALSE@		../src/include/fp.h \
-@BUILD_WITH_SAFEC_FALSE@		../src/include/extractor.h
+@BUILD_WITH_SAFEC_FALSE@		../src/include/wht.h 
 
 @BUILD_WITH_SAFEC_TRUE@libjoy_la_SOURCES = \
 @BUILD_WITH_SAFEC_TRUE@	../src/joy_api.c \
@@ -594,9 +592,7 @@ lib_LTLIBRARIES = libjoy.la
 @BUILD_WITH_SAFEC_TRUE@		../src/include/utils.h \
 @BUILD_WITH_SAFEC_TRUE@		../src/include/fp.h \
 @BUILD_WITH_SAFEC_TRUE@		../src/include/extractor.h \
-@BUILD_WITH_SAFEC_TRUE@		../src/include/wht.h \
-@BUILD_WITH_SAFEC_TRUE@		../src/include/fp.h \
-@BUILD_WITH_SAFEC_TRUE@		../src/include/extractor.h
+@BUILD_WITH_SAFEC_TRUE@		../src/include/wht.h 
 
 libjoy_la_CFLAGS = -I ../src/include -I $(SSL_CFLAGS) $(AM_CFLAGS) -I $(SAFEC_DIR)/include -I $(SAFEC_DIR)/include/safec
 library_includedir = $(includedir)/joy
@@ -642,9 +638,7 @@ library_include_HEADERS = \
 		../src/include/utils.h \
 		../src/include/fp.h \
 		../src/include/extractor.h \
-		../src/include/wht.h \
-		../src/include/fp.h \
-		../src/include/extractor.h
+		../src/include/wht.h 
 
 @BUILD_WITH_SAFEC_FALSE@libjoy_la_LIBADD = $(SSL_LDFLAGS) -lcrypto
 @BUILD_WITH_SAFEC_TRUE@libjoy_la_LIBADD = -L$(SAFEC_DIR)/lib -lciscosafec