diff options
| author | Jakob Odersky <jodersky@gmail.com> | 2014-03-31 19:22:18 +0200 |
|---|---|---|
| committer | Jakob Odersky <jodersky@gmail.com> | 2014-03-31 19:22:18 +0200 |
| commit | 26b3deaba4e029a6aaea49c6652f7156ec17bbc0 (patch) | |
| tree | 104136acb38cc29a6a25b6fe902e185fbb280f05 /flow-native | |
| parent | 7d4a8d3b561571e5e09e2b23a3b5298127ac2d2f (diff) | |
| download | akka-serial-26b3deaba4e029a6aaea49c6652f7156ec17bbc0.tar.gz akka-serial-26b3deaba4e029a6aaea49c6652f7156ec17bbc0.tar.bz2 akka-serial-26b3deaba4e029a6aaea49c6652f7156ec17bbc0.zip | |
update makefile
Diffstat (limited to 'flow-native')
| -rw-r--r-- | flow-native/Makefile | 3 | ||||
| -rw-r--r-- | flow-native/common.mk | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/flow-native/Makefile b/flow-native/Makefile index 0a64190..29080a3 100644 --- a/flow-native/Makefile +++ b/flow-native/Makefile @@ -14,8 +14,9 @@ SONAME=$(LIB).$(MAJOR) # Actual file name of library TARGET=$(SONAME).$(MINOR).$(MICRO) -# Linux-specific linker flags +# Linux-specific flags LDFLAGS+=-shared -Wl,-soname,$(SONAME) +INCLUDES+=$(JAVA_HOME)/include/ $(JAVA_HOME)/include/linux/ # All final products that should be installed PRODUCTS=$(TARGET) $(SONAME) $(LIB) diff --git a/flow-native/common.mk b/flow-native/common.mk index be9f980..1ce66a6 100644 --- a/flow-native/common.mk +++ b/flow-native/common.mk @@ -8,7 +8,7 @@ NAME=flow3 # Library versions # -# Note that MAJOR should always be set tozero +# Note that MAJOR should always be set to zero # since java does not allow loading semantically # versioned libraries, include the major version # in the name instead. @@ -18,7 +18,7 @@ MINOR=0# backwards-compatible changes MICRO=0# bugfixes -# Directory where the library will be installed +# Directory where the library will be installed (without /lib) # PREFIX?=/usr @@ -41,7 +41,7 @@ JAVA_HOME?=/usr/lib/jvm/java-7-oracle # Include directories # -INCLUDES=./include/ $(JAVA_HOME)/include/ $(JAVA_HOME)/include/linux/ +INCLUDES=./include # Objects that will be compiled from respective .c files |