diff options
| author | rose-edg4-demo <derickhuth@gmail.com> | 2016-01-18 18:39:53 -0800 |
|---|---|---|
| committer | rose-edg4-demo <derickhuth@gmail.com> | 2016-01-18 18:39:53 -0800 |
| commit | 1419de621b01ef899e5b4d0d0b90e46616d580d3 (patch) | |
| tree | 5b4da2a1eed9f91894528939dbc39a57a515c1b3 /omega | |
| parent | 983749787ee0dc1beb1107873e8a13ebdaeba576 (diff) | |
| download | chill-1419de621b01ef899e5b4d0d0b90e46616d580d3.tar.gz chill-1419de621b01ef899e5b4d0d0b90e46616d580d3.tar.bz2 chill-1419de621b01ef899e5b4d0d0b90e46616d580d3.zip | |
small bugfix
Diffstat (limited to 'omega')
| -rw-r--r-- | omega/aclocal.m4 | 3 | ||||
| -rw-r--r-- | omega/code_gen/obj/Makefile.am | 2 | ||||
| -rw-r--r-- | omega/code_gen/obj/Makefile.in | 2 | ||||
| -rwxr-xr-x | omega/configure | 1 |
4 files changed, 3 insertions, 5 deletions
diff --git a/omega/aclocal.m4 b/omega/aclocal.m4 index ec90bbe..a2aaad2 100644 --- a/omega/aclocal.m4 +++ b/omega/aclocal.m4 @@ -633,8 +633,7 @@ to "yes", and re-run configure. END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi -]) +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further diff --git a/omega/code_gen/obj/Makefile.am b/omega/code_gen/obj/Makefile.am index cd85b8b..f218be6 100644 --- a/omega/code_gen/obj/Makefile.am +++ b/omega/code_gen/obj/Makefile.am @@ -3,7 +3,7 @@ noinst_LIBRARIES =libcodegen.a libcodegen_a_SOURCES =../src/codegen.cc ../src/CG_stringBuilder.cc ../src/CG.cc ../src/CG_utils.cc libcodegen_a_CFLAGS =-Wno-write-strings -libcodegen_a_CPPFLAGS =-I../include -I../../omega_lib/include -I$(ROSEHOME)/include -I$(BOOSTHOME)/include +libcodegen_a_CPPFLAGS =-I../include -I../../omega_lib/include -I$(ROSEHOME)/include/rose -I$(BOOSTHOME)/include #if BUILD_ROSE libcodegen_a_SOURCES += ../src/rose_attributes.cc ../src/CG_roseRepr.cc ../src/CG_roseBuilder.cc #endif diff --git a/omega/code_gen/obj/Makefile.in b/omega/code_gen/obj/Makefile.in index a350281..876e7e9 100644 --- a/omega/code_gen/obj/Makefile.in +++ b/omega/code_gen/obj/Makefile.in @@ -269,7 +269,7 @@ libcodegen_a_SOURCES = ../src/codegen.cc ../src/CG_stringBuilder.cc \ ../src/CG.cc ../src/CG_utils.cc ../src/rose_attributes.cc \ ../src/CG_roseRepr.cc ../src/CG_roseBuilder.cc libcodegen_a_CFLAGS = -Wno-write-strings -libcodegen_a_CPPFLAGS = -I../include -I../../omega_lib/include -I$(ROSEHOME)/include -I$(BOOSTHOME)/include +libcodegen_a_CPPFLAGS = -I../include -I../../omega_lib/include -I$(ROSEHOME)/include/rose -I$(BOOSTHOME)/include all: all-am .SUFFIXES: diff --git a/omega/configure b/omega/configure index 3a9175c..20a4dfd 100755 --- a/omega/configure +++ b/omega/configure @@ -2513,7 +2513,6 @@ END fi fi - ### Use the C++ compiler for linking (C is default) ### CCLD="$""(CXX)" |