Skip to content
Browse files

Merge pull request #121 from cknadler/master

Fix rcomp on Travis
  • Loading branch information...
2 parents 31ccd2b + 374de4d commit e90819b96cd26d334c2f1637f1717c31965b9c06 @cknadler cknadler committed Dec 5, 2012
Showing with 7 additions and 6 deletions.
  1. +1 −0 .gitignore
  2. +1 −1 .travis.yml
  3. +1 −0 configure.ac
  4. +3 −4 src/Makefile.am
  5. +1 −1 test/expected/literals/literals3.out
View
1 .gitignore
@@ -11,6 +11,7 @@ math
# Automake generated files and folders
Makefile
src/Makefile
+compile
config.log
config.status
*.Po
View
2 .travis.yml
@@ -3,4 +3,4 @@ compiler:
- clang
- gcc
install: ./auto-build-env && make
-script: bundle install && rcomp test
+script: bundle install && rcomp init && rcomp test
View
1 configure.ac
@@ -14,3 +14,4 @@ AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")
AC_OUTPUT
+AM_PROG_CC_C_O
View
7 src/Makefile.am
@@ -36,14 +36,13 @@ statement/hklr_statement_while.c \
linenoise/linenoise.c
math_SOURCES = module/math.c
-math_SOURCES += hkl_value.c
+math_SOURCES += $(hkl_SOURCES)
math_LDFLAGS = -shared -nostartfiles
-math_LDADD = -lm
math_CFLAGS = $(AM_CFLAGS)
math_CFLAGS += -fPIC
io_SOURCES = module/io.c
-io_SOURCES += hkl_value.c hkl_string.c
+io_SOURCES += $(hkl_SOURCES)
io_LDFLAGS = -shared -nostartfiles
io_CFLAGS = $(AM_CFLAGS)
-io_CFLAGS += -fPIC
+io_CFLAGS += -fPIC
View
2 test/expected/literals/literals3.out
@@ -1 +1 @@
-3.14159
+3.141593

0 comments on commit e90819b

Please sign in to comment.
Something went wrong with that request. Please try again.