sync up changes from the build submitted to Germany
This commit is contained in:
@@ -33,11 +33,7 @@ EXTRA_DIST = *.exp
|
||||
|
||||
CASAROOT = ../../..
|
||||
|
||||
if cpu_64
|
||||
CASALIBDIR = $(CASAROOT)/lib64
|
||||
else
|
||||
CASALIBDIR = $(CASAROOT)/lib
|
||||
endif
|
||||
CASALIBDIR = $(CASAROOT)/$(LIB)
|
||||
|
||||
BUILD_VER = 1.1.1
|
||||
|
||||
@@ -58,15 +54,11 @@ INCLUDES = -I. -I.. -I$(CASAROOT)/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/
|
||||
RESOURCES =
|
||||
DEFINES =
|
||||
CFLAGS += $(INCLUDES) $(DEFINES)
|
||||
LIBS = -lpthread -lc -ldl
|
||||
LDFLAGS = -Wl,-Bsymbolic -shared -Wl,--version-script=jmicasa_lux.exp -Wl,-rpath -Wl,/usr/lib \
|
||||
LIBS = -lpthread -ldl
|
||||
LDFLAGS = -Wl,-Bsymbolic -shared -Wl,--version-script=jmicasa_lux.exp \
|
||||
-L$(CASALIBDIR)/$(TARGET_CFG) -lmicasa -Wl,-soname -Wl,libjmicasa.so.1
|
||||
|
||||
if cpu_64
|
||||
OBJDIR = ./$(TARGET_CFG)/lib64
|
||||
else
|
||||
OBJDIR = ./$(TARGET_CFG)/lib
|
||||
endif
|
||||
OBJDIR = ./$(TARGET_CFG)/$(LIB)
|
||||
|
||||
OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o))
|
||||
|
||||
|
||||
@@ -33,11 +33,7 @@ EXTRA_DIST =$(JAVAFILES) com/novell/casa/*.java
|
||||
|
||||
CASAROOT = ../..
|
||||
|
||||
if cpu_64
|
||||
CASALIBDIR = $(CASAROOT)/lib64
|
||||
else
|
||||
CASALIBDIR = $(CASAROOT)/lib
|
||||
endif
|
||||
CASALIBDIR = $(CASAROOT)/$(LIB)
|
||||
|
||||
|
||||
JAVAROOT = .
|
||||
@@ -66,11 +62,7 @@ CFLAGS += $(INCLUDES) $(DEFINES)
|
||||
LIBS =
|
||||
LDFLAGS =
|
||||
|
||||
if cpu_64
|
||||
OBJDIR = ./$(TARGET_CFG)/lib64
|
||||
else
|
||||
OBJDIR = ./$(TARGET_CFG)/lib
|
||||
endif
|
||||
OBJDIR = ./$(TARGET_CFG)/$(LIB)
|
||||
|
||||
OBJS =
|
||||
|
||||
|
||||
Reference in New Issue
Block a user