casa-auth-token-server: check in the changes by german autobuild team
This commit is contained in:
@@ -42,6 +42,9 @@ LIBDIR = $(ROOT)/$(LIB)
|
||||
BINDIR = $(ROOT)/$(BIN)
|
||||
|
||||
IBM_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre/bin
|
||||
IBM_JAVA_XLIBDIR = @JVM_LIBDIR@
|
||||
IBM_JAVA_THREAD = @JVM_LIB_THREAD@
|
||||
BEA_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre/lib/ia64/jrockit
|
||||
|
||||
if LIB64
|
||||
SUN_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre/lib/amd64/server
|
||||
@@ -72,12 +75,17 @@ CFLAGS += -Wno-format-extra-args -fno-strict-aliasing $(INCLUDES) $(DEFINES)
|
||||
CPPFLAGS += -Wno-format-extra-args -fno-strict-aliasing -fPIC $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
|
||||
|
||||
if IBM_JVM
|
||||
LIBS += -lpthread -lcasa_s_ipc -ljvm -ljsig -lj9thr23 -ldl
|
||||
LDFLAGS += -L$(LIBDIR)/$(TARGET_CFG) -L$(IBM_JAVA_LIBDIR) -L$(IBM_JAVA_LIBDIR)/classic
|
||||
LIBS += -lpthread -lcasa_s_ipc -ljvm -ljsig $(IBM_JAVA_THREAD) -ldl
|
||||
LDFLAGS += -L$(LIBDIR)/$(TARGET_CFG) -L$(IBM_JAVA_LIBDIR) -L$(IBM_JAVA_LIBDIR)/classic -L$(IBM_JAVA_XLIBDIR)
|
||||
else
|
||||
if BEA_JVM
|
||||
LIBS += -lpthread -lcasa_s_ipc -ljvm -ljsig -ldl
|
||||
LDFLAGS += -L$(LIBDIR)/$(TARGET_CFG) -L$(BEA_JAVA_LIBDIR)
|
||||
else
|
||||
LIBS += -lpthread -lcasa_s_ipc -ljvm -ljsig -ldl
|
||||
LDFLAGS += -L$(LIBDIR)/$(TARGET_CFG) -L$(SUN_JAVA_LIBDIR)
|
||||
endif
|
||||
endif
|
||||
|
||||
OBJDIR = ./$(TARGET_CFG)/$(LIB)
|
||||
OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o)) $(addprefix $(OBJDIR)/, $(CPPFILES:%.cpp=%.o))
|
||||
|
||||
Reference in New Issue
Block a user