ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-22 12:28:11 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

makefile cleanups

Browse Source
This commit is contained in:
Eric Scharff 2007-10-26 16:16:47 -06:00
parent 789cc8e9a2
commit 8f604ca7e1
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
makefile
View File

@ -33,14 +33,6 @@ input = $(test-build)/Hello.class
build-cxx = g++ build-cxx = g++
build-cc = gcc build-cc = gcc
pthread = -pthread
lpthread = -lpthread
ifeq ($(platform),darwin)
pthread =
lpthread =
endif
cxx = $(build-cxx) cxx = $(build-cxx)
cc = $(build-cc) cc = $(build-cc)
ar = ar ar = ar
@ -64,13 +56,13 @@ common-cflags = $(warnings) -fno-rtti -fno-exceptions \
-D__STDC_LIMIT_MACROS -D_JNI_IMPLEMENTATION_ -D__STDC_LIMIT_MACROS -D_JNI_IMPLEMENTATION_
build-cflags = $(common-cflags) -fPIC -fvisibility=hidden \ build-cflags = $(common-cflags) -fPIC -fvisibility=hidden \
-I$(JAVA_HOME)/include/linux -I$(src) $(pthread) -I$(JAVA_HOME)/include/linux -I$(src) -pthread
cflags = $(build-cflags) cflags = $(build-cflags)
common-lflags = -lm -lz common-lflags = -lm -lz
lflags = $(common-lflags) $(lpthread) -ldl -rdynamic lflags = $(common-lflags) -lpthread -ldl -rdynamic
system = posix system = posix
asm = x86 asm = x86
@ -86,8 +78,9 @@ ifeq ($(arch),i386)
endif endif
ifeq ($(platform),darwin) ifeq ($(platform),darwin)
build-cflags = $(common-cflags) -fPIC -fvisibility=hidden \
-I$(JAVA_HOME)/include/linux -I$(src)
lflags = $(common-lflags) -ldl lflags = $(common-lflags) -ldl
objcopy = gobjcopy
endif endif
ifeq ($(platform),windows) ifeq ($(platform),windows)