Finished the auth token client port to Linux and made some minor

makefile system maintenance.
This commit is contained in:
Juan Carlos Luciani
2006-10-05 21:25:00 +00:00
parent 8db0e78d31
commit c076f68b37
20 changed files with 149 additions and 55 deletions

View File

@@ -29,8 +29,6 @@ TARGET_CFG = Release
DEFINES = -DNDEBUG
endif
CFLAGS += -Wno-format-extra-args -fno-strict-aliasing
SUBDIRS =
DIST_SUBDIRS =
@@ -58,7 +56,11 @@ CSFILES_CSC :=
INCLUDES = -I. -I$(ROOT)/include -I$(APACHEINCLUDE) -I$(APRINCLUDE)
RESOURCES =
CFLAGS += $(INCLUDES) $(DEFINES) -D_LARGEFILE64_SOURCE
if LIB64
DEFINES += -D_LIB64
endif
CFLAGS += -Wno-format-extra-args -fno-strict-aliasing $(INCLUDES) $(DEFINES) -D_LARGEFILE64_SOURCE
LIBS = -lpthread -lcasa_s_authtoken -lapr-1 -laprutil-1
LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT) -L$(LIBDIR)/$(TARGET_CFG) -L$(APACHELIB) -L$(APRLIB) -Xlinker

View File

@@ -29,8 +29,6 @@ TARGET_CFG = Release
DEFINES = -DNDEBUG
endif
CFLAGS += -Wno-format-extra-args -fno-strict-aliasing -fshort-wchar
# Override the link setting for C++
LINK = g++
@@ -57,8 +55,13 @@ CPPFILES = server.cpp
CSFILES_CSC :=
INCLUDES = -I. -I$(ROOT)/include -I$(JAVA_INCDIR)
RESOURCES =
CFLAGS += $(INCLUDES) $(DEFINES)
CPPFLAGS += -fPIC $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
if LIB64
DEFINES += -D_LIB64
endif
CFLAGS += -Wno-format-extra-args -fno-strict-aliasing $(INCLUDES) $(DEFINES)
CPPFLAGS += -Wno-format-extra-args -fno-strict-aliasing -fPIC $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
LIBS = -lpthread -lcasa_s_ipc -ljvm -ljsig -lj9thr23
LDFLAGS = -L$(LIBDIR)/$(TARGET_CFG) -L$(JAVA_LIBDIR) -L$(JAVA_LIBDIR)/classic

View File

@@ -10,6 +10,6 @@
# #
#######################################################
LibraryName /usr/lib/casa_iden_token.so
LibraryName /usr/lib/CASA/authtoken/casa_iden_token.so

View File

@@ -0,0 +1,15 @@
#######################################################
# #
# CASA Authentication Token System configuration file #
# for module: #
# #
# CasaIdentityToken #
# #
# Note: This module is the provider of Casa Identity #
# tokens. #
# #
#######################################################
LibraryName /usr/lib64/CASA/authtoken/casa_iden_token.so

View File

@@ -23,8 +23,10 @@
if DEBUG
TARGET_CFG = Debug
CFLAGS += -v -w
DEFINES = -DDBG
else
TARGET_CFG = Release
DEFINES = -DNDEBUG
endif
SUBDIRS =
@@ -54,15 +56,23 @@ CFILES = ../identokenprovider.c \
CSFILES_CSC :=
INCLUDES = -I. -I.. -I../../.. -I$(CASAINCLUDE) -I../../../../../include
RESOURCES =
DEFINES = -fno-strict-aliasing
CFLAGS += $(INCLUDES) $(DEFINES)
DEST_CONF_FILE_NAME = CasaIdentityToken.conf
if LIB64
DEFINES += -D_LIB64
SRC_CONF_FILE_NAME = CasaIdentityToken_lib64.conf
else
SRC_CONF_FILE_NAME = CasaIdentityToken.conf
endif
CFLAGS += -Wno-format-extra-args -fno-strict-aliasing $(INCLUDES) $(DEFINES)
LIBS = -lpthread -ldl -lexpat
LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT)
OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o))
EXTRA_DIST = $(CFILES) *.h CasaIdentityToken.conf
EXTRA_DIST = $(CFILES) *.h CasaIdentityToken.conf CasaIdentityToken_lib64.conf
CUR_DIR := $(shell pwd)
@@ -84,6 +94,7 @@ $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT): $(OBJDIR) $(OBJS)
@echo [======== Linking $@ ========]
$(LINK) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
cp -f $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) $(LIBDIR)/$(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT)
cp -f $(SRC_CONF_FILE_NAME) $(LIBDIR)/$(TARGET_CFG)/$(DEST_CONF_FILE_NAME)
$(OBJDIR):
[ -d $(OBJDIR) ] || mkdir -p $(OBJDIR)

View File

@@ -29,8 +29,6 @@ TARGET_CFG = Release
DEFINES = -DNDEBUG
endif
CFLAGS += -Wno-format-extra-args -fno-strict-aliasing
SUBDIRS =
DIST_SUBDIRS =
@@ -59,10 +57,12 @@ CFILES = ../config.c \
CSFILES_CSC :=
INCLUDES = -I. -I.. -I$(CASAINCLUDE) -I../../../include
RESOURCES =
if LIB64
DEFINES += -D_LIB64
endif
CFLAGS += $(INCLUDES) $(DEFINES)
CFLAGS += -Wno-format-extra-args -fno-strict-aliasing $(INCLUDES) $(DEFINES)
LIBS = -lpthread -ldl
LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT) -L$(ROOT)/lib/$(TARGET_CFG)