geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Partial changes to the make system to deal with the new CASA directory/rpm

Browse Source 
structure.
This commit is contained in:
Juan Carlos Luciani 2006-06-19 20:14:49 +00:00
parent 723bf2b277
commit ec24ad0e1c
10 changed files with 78 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CASA-auth-token/Makefile.am
View File

@ -20,18 +20,21 @@
# #
####################################################################### #######################################################################
SUBDIRS = server SUBDIRS = server package
DIST_SUBDIRS = include server DIST_SUBDIRS = include server package
CFILES = CFILES =
EXTRA_DIST = $(CFILES) *.h EXTRA_DIST = $(CFILES)
.PHONY: package package-clean package-install package-uninstall .PHONY: package package-clean package-install package-uninstall
package package-clean package-install package-uninstall: package package-clean package-install package-uninstall:
$(MAKE) -C $(TARGET_OS) $@ $(MAKE) -C $(TARGET_OS) $@
clean-local:
if [ -d lib ]; then rm -rf lib; fi
maintainer-clean-local: maintainer-clean-local:
rm -f Makefile.in rm -f Makefile.in

4
CASA-auth-token/README
View File

@ -6,14 +6,14 @@
INTRODUCTION INTRODUCTION
auth_token is an authentication token infrastructure with support for multiple CASA-auth-token is an authentication token infrastructure with support for multiple
authentication mechanisms with an emphasis on providing a scalable single authentication mechanisms with an emphasis on providing a scalable single
sign-on solution. sign-on solution.
A key feature of auth_token is that its authentication tokens contain identity A key feature of auth_token is that its authentication tokens contain identity
information about the entity being authenticated. This information is made available information about the entity being authenticated. This information is made available
to the consuming services. The amount of information contained in the tokens is to the consuming services. The amount of information contained in the tokens is
configured on a per-service basis. Because of this feature, we say that auth_token configured on a per-service basis. Because of this feature, we say that CASA-auth-token
projects an "Authenticated Identity". projects an "Authenticated Identity".
ARCHITECTURE COMPONENTS ARCHITECTURE COMPONENTS

14
CASA-auth-token/configure.in
View File

@ -260,6 +260,10 @@ fi
# #
AC_OUTPUT([ AC_OUTPUT([
Makefile Makefile
package/Makefile
package/linux/Makefile
package/linux/CASA-auth-token.spec
include/Makefile
server/Makefile server/Makefile
server/AuthTokenValidate/Makefile server/AuthTokenValidate/Makefile
server/AuthTokenValidate/linux/Makefile server/AuthTokenValidate/linux/Makefile
@ -272,6 +276,16 @@ server/ApacheSupport/Makefile
server/ApacheSupport/2.2/Makefile server/ApacheSupport/2.2/Makefile
server/ApacheSupport/2.2/linux/Makefile server/ApacheSupport/2.2/linux/Makefile
server/AuthTokenSvc/Makefile server/AuthTokenSvc/Makefile
server/AuthTokenSvc/src/Makefile
server/AuthTokenSvc/src/com/Makefile
server/AuthTokenSvc/src/com/novell/Makefile
server/AuthTokenSvc/src/com/novell/casa/Makefile
server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Makefile
server/JaasSupport/Makefile server/JaasSupport/Makefile
server/JaasSupport/src/Makefile
server/JaasSupport/src/com/Makefile
server/JaasSupport/src/com/novell/Makefile
server/JaasSupport/src/com/novell/casa/Makefile
server/JaasSupport/src/com/novell/casa/jaas/Makefile
]) ])

18
CASA-auth-token/server/ApacheSupport/2.2/linux/Makefile.am
View File

@ -31,10 +31,12 @@ SUBDIRS =
DIST_SUBDIRS = DIST_SUBDIRS =
CASAROOT = ../../../../.. ROOT = ../../../..
CASALIBDIR = $(CASAROOT)/$(LIB) CASAINCLUDE = ../../../../../CASA/include
APACHEROOT = /home/jluciani/dev-local/apache2.2
LIBDIR = $(ROOT)/$(LIB)
APACHEROOT = ../../../../../../httpd-2.2.2/instance
# handle Mono secondary dependencies # handle Mono secondary dependencies
export MONO_PATH := $(MONO_PATH) export MONO_PATH := $(MONO_PATH)
@ -48,13 +50,13 @@ MODULE_EXT = so
CFILES = ../mod_authn_casa.c CFILES = ../mod_authn_casa.c
CSFILES_CSC := CSFILES_CSC :=
INCLUDES = -I. -I$(CASAROOT)/include -I$(APACHEROOT)/include INCLUDES = -I. -I$(CASAINCLUDE) -I$(ROOT)/include -I$(APACHEROOT)/include
RESOURCES = RESOURCES =
DEFINES = -Wno-format-extra-args -fno-strict-aliasing DEFINES = -Wno-format-extra-args -fno-strict-aliasing
CFLAGS += $(INCLUDES) $(DEFINES) -D_LARGEFILE64_SOURCE CFLAGS += $(INCLUDES) $(DEFINES) -D_LARGEFILE64_SOURCE
LIBS = -lpthread -lcasa_s_authtoken -lapr-1 -laprutil-1 LIBS = -lpthread -lcasa_s_authtoken -lapr-1 -laprutil-1
LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT) -L$(CASALIBDIR)/$(TARGET_CFG) -L$(APACHEROOT)/lib -Xlinker -rpath -Xlinker /opt/novell/CASA/lib LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT) -L$(LIBDIR)/$(TARGET_CFG) -L$(APACHEROOT)/lib -Xlinker -rpath -Xlinker /opt/novell/CASA/lib
OBJDIR = ./$(TARGET_CFG)/$(LIB) OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o)) OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o))
@ -80,12 +82,12 @@ $(OBJDIR)/%.o: %.cpp
$(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT): $(OBJDIR) $(OBJS) $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT): $(OBJDIR) $(OBJS)
@echo [======== Linking $@ ========] @echo [======== Linking $@ ========]
$(LINK) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) $(LINK) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
cp -f $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) $(CASALIBDIR)/$(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT) cp -f $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) $(LIBDIR)/$(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT)
$(OBJDIR): $(OBJDIR):
[ -d $(OBJDIR) ] || mkdir -p $(OBJDIR) [ -d $(OBJDIR) ] || mkdir -p $(OBJDIR)
[ -d $(CASALIBDIR) ] || mkdir -p $(CASALIBDIR) [ -d $(LIBDIR) ] || mkdir -p $(LIBDIR)
[ -d $(CASALIBDIR)/$(TARGET_CFG) ] || mkdir -p $(CASALIBDIR)/$(TARGET_CFG) [ -d $(LIBDIR)/$(TARGET_CFG) ] || mkdir -p $(LIBDIR)/$(TARGET_CFG)
install-exec-local: $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) install-exec-local: $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT)
$(mkinstalldirs) $(DESTDIR)$(libdir) $(mkinstalldirs) $(DESTDIR)$(libdir)

32
CASA-auth-token/server/AuthTokenSvc/Makefile.am
View File

@ -19,14 +19,14 @@
# #
####################################################################### #######################################################################
SUBDIRS = SUBDIRS = src
DIST_SUBDIRS = src src/com src/com/novell src/com/novell/casa src/com/novell/casa/authtoksvc DIST_SUBDIRS = src
EXTRA_DIST = $(JAVAFILES) EXTRA_DIST =
CASAROOT = ../../.. ROOT = ../..
CASALIBDIR = $(CASAROOT)/$(LIB) LIBDIR = $(ROOT)/$(LIB)
IDENT_ABSTRACTION_DIR = /home/jluciani/dev-local/bandit/trunk/IdentityAbstraction/build IDENT_ABSTRACTION_DIR = /home/jluciani/dev-local/bandit/trunk/IdentityAbstraction/build
IDENT_ABSTRACTION_DEPENDANCIES_DIR = /home/jluciani/dev-local/bandit/trunk/commons/bin IDENT_ABSTRACTION_DEPENDANCIES_DIR = /home/jluciani/dev-local/bandit/trunk/commons/bin
@ -69,16 +69,6 @@ BUILDDIR = build
WEBAPP = $(WEBAPP_NAME).$(WEBAPP_EXT) WEBAPP = $(WEBAPP_NAME).$(WEBAPP_EXT)
#AUTHTOKEN_FILES = -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/AuthToken.class \
# -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/AuthToken$SAXHandler.cless \
# -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/AuthTokenConfig.class \
# -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/AuthTokenConfig$SAXHandler.class \
# -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/IdenTokenConfig.class \
# -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/IdenTokenConfig$SAXHandler.class \
# -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/IdentityToken.class \
# -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/CasaIdentityToken.class \
# -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/CasaIdentityToken$SAXHandler.class \
# -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/Base64Coder.class
AUTHTOKEN_FILES = -C $(BUILDDIR)/webapp/WEB-INF/classes com AUTHTOKEN_FILES = -C $(BUILDDIR)/webapp/WEB-INF/classes com
CLASSES = $(addprefix $(BUILDDIR)/, $(JAVAFILES:%.java=%.class)) CLASSES = $(addprefix $(BUILDDIR)/, $(JAVAFILES:%.java=%.class))
@ -105,12 +95,12 @@ $(BUILDDIR)/$(WEBAPP): $(BUILDDIR) $(CLASSES)
cp $(IDENT_ABSTRACTION_DIR)/*.jar $(BUILDDIR)/webapp/WEB-INF/lib/ cp $(IDENT_ABSTRACTION_DIR)/*.jar $(BUILDDIR)/webapp/WEB-INF/lib/
cp $(IDENT_ABSTRACTION_DEPENDANCIES_DIR)/*.jar $(BUILDDIR)/webapp/WEB-INF/lib/ cp $(IDENT_ABSTRACTION_DEPENDANCIES_DIR)/*.jar $(BUILDDIR)/webapp/WEB-INF/lib/
jar cvf $(BUILDDIR)/$(WEBAPP) -C $(BUILDDIR)/webapp . jar cvf $(BUILDDIR)/$(WEBAPP) -C $(BUILDDIR)/webapp .
cp $(BUILDDIR)/$(WEBAPP) $(CASALIBDIR)/java/ cp $(BUILDDIR)/$(WEBAPP) $(LIBDIR)/java/
$(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT): $(BUILDDIR) $(CLASSES) $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT): $(BUILDDIR) $(CLASSES)
@echo [======== Jarring $@ ========] @echo [======== Jarring $@ ========]
jar cvf $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT) $(AUTHTOKEN_FILES) jar cvf $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT) $(AUTHTOKEN_FILES)
cp $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT) $(CASALIBDIR)/java/ cp $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT) $(LIBDIR)/java/
$(BUILDDIR): $(BUILDDIR):
[ -d $(BUILDDIR) ] || mkdir -p $(BUILDDIR) [ -d $(BUILDDIR) ] || mkdir -p $(BUILDDIR)
@ -124,8 +114,8 @@ $(BUILDDIR):
[ -d $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms [ -d $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms
[ -d $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/Krb5Authenticate ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/Krb5Authenticate [ -d $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/Krb5Authenticate ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/Krb5Authenticate
[ -d $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/PwdAuthenticate ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/PwdAuthenticate [ -d $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/PwdAuthenticate ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/PwdAuthenticate
[ -d $(CASALIBDIR) ] || mkdir -p $(CASALIBDIR) [ -d $(LIBDIR) ] || mkdir -p $(LIBDIR)
[ -d $(CASALIBDIR)/java ] || mkdir -p $(CASALIBDIR)/java [ -d $(LIBDIR)/java ] || mkdir -p $(LIBDIR)/java
install-exec-local: install-exec-local:
@ -135,8 +125,8 @@ uninstall-local:
clean-local: clean-local:
if [ -d $(BUILDDIR) ]; then rm -rf $(BUILDDIR); fi if [ -d $(BUILDDIR) ]; then rm -rf $(BUILDDIR); fi
if [ -f $(CASALIBDIR)/java/$(MODULE_NAME).$(MODULE_EXT) ]; then rm -f $(CASALIBDIR)/java/$(MODULE_NAME).$(MODULE_EXT); fi if [ -f $(LIBDIR)/java/$(MODULE_NAME).$(MODULE_EXT) ]; then rm -f $(LIBDIR)/java/$(MODULE_NAME).$(MODULE_EXT); fi
if [ -f $(CASALIBDIR)/java/$(WEBAPP) ]; then rm -f $(CASALIBDIR)/java/$(WEBAPP); fi if [ -f $(LIBDIR)/java/$(WEBAPP) ]; then rm -f $(LIBDIR)/java/$(WEBAPP); fi
distclean-local: distclean-local:

14
CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile.am
View File

@ -31,9 +31,11 @@ SUBDIRS =
DIST_SUBDIRS = DIST_SUBDIRS =
CASAROOT = ../../../../../.. ROOT = ../../../../../..
CASALIBDIR = $(CASAROOT)/$(LIB) CASAINCLUDE = ../../../../../../CASA/include
LIBDIR = $(ROOT)/$(LIB)
# handle Mono secondary dependencies # handle Mono secondary dependencies
export MONO_PATH := $(MONO_PATH) export MONO_PATH := $(MONO_PATH)
@ -50,7 +52,7 @@ CFILES = $(srcdir)/identokenprovider.c \
$(srcdir)/platform.c $(srcdir)/platform.c
CSFILES_CSC := CSFILES_CSC :=
INCLUDES = -I. -I.. -I../../.. -I$(CASAROOT)/include -I../../../../../include INCLUDES = -I. -I.. -I../../.. -I$(CASAINCLUDE) -I../../../../../include
RESOURCES = RESOURCES =
DEFINES = -Wno-format-extra-args -fno-strict-aliasing DEFINES = -Wno-format-extra-args -fno-strict-aliasing
CFLAGS += $(INCLUDES) $(DEFINES) CFLAGS += $(INCLUDES) $(DEFINES)
@ -81,12 +83,12 @@ $(OBJDIR)/%.o: %.cpp
$(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT): $(OBJDIR) $(OBJS) $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT): $(OBJDIR) $(OBJS)
@echo [======== Linking $@ ========] @echo [======== Linking $@ ========]
$(LINK) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) $(LINK) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
cp -f $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) $(CASALIBDIR)/$(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT) cp -f $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) $(LIBDIR)/$(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT)
$(OBJDIR): $(OBJDIR):
[ -d $(OBJDIR) ] || mkdir -p $(OBJDIR) [ -d $(OBJDIR) ] || mkdir -p $(OBJDIR)
[ -d $(CASALIBDIR) ] || mkdir -p $(CASALIBDIR) [ -d $(LIBDIR) ] || mkdir -p $(LIBDIR)
[ -d $(CASALIBDIR)/$(TARGET_CFG) ] || mkdir -p $(CASALIBDIR)/$(TARGET_CFG) [ -d $(LIBDIR)/$(TARGET_CFG) ] || mkdir -p $(LIBDIR)/$(TARGET_CFG)
install-exec-local: $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) install-exec-local: $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT)

13
CASA-auth-token/server/AuthTokenValidate/linux/Makefile.am
View File

@ -31,9 +31,10 @@ SUBDIRS =
DIST_SUBDIRS = DIST_SUBDIRS =
CASAROOT = ../../../../ ROOT = ../../../
CASAINCLUDE = ../../../../CASA/include
CASALIBDIR = $(CASAROOT)/$(LIB) LIBDIR = $(ROOT)/$(LIB)
# handle Mono secondary dependencies # handle Mono secondary dependencies
export MONO_PATH := $(MONO_PATH) export MONO_PATH := $(MONO_PATH)
@ -53,7 +54,7 @@ CFILES = $(srcdir)/config.c \
$(srcdir)/platform.c $(srcdir)/platform.c
CSFILES_CSC := CSFILES_CSC :=
INCLUDES = -I. -I.. -I$(CASAROOT)/include -I../../../include INCLUDES = -I. -I.. -I$(CASAINCLUDE) -I../../../include
RESOURCES = RESOURCES =
DEFINES = -Wno-format-extra-args -fno-strict-aliasing DEFINES = -Wno-format-extra-args -fno-strict-aliasing
CFLAGS += $(INCLUDES) $(DEFINES) CFLAGS += $(INCLUDES) $(DEFINES)
@ -84,12 +85,12 @@ $(OBJDIR)/%.o: %.cpp
$(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT): $(OBJDIR) $(OBJS) $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT): $(OBJDIR) $(OBJS)
@echo [======== Linking $@ ========] @echo [======== Linking $@ ========]
$(LINK) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) $(LINK) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
cp -f $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) $(CASALIBDIR)/$(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT) cp -f $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) $(LIBDIR)/$(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT)
$(OBJDIR): $(OBJDIR):
[ -d $(OBJDIR) ] || mkdir -p $(OBJDIR) [ -d $(OBJDIR) ] || mkdir -p $(OBJDIR)
[ -d $(CASALIBDIR) ] || mkdir -p $(CASALIBDIR) [ -d $(LIBDIR) ] || mkdir -p $(LIBDIR)
[ -d $(CASALIBDIR)/$(TARGET_CFG) ] || mkdir -p $(CASALIBDIR)/$(TARGET_CFG) [ -d $(LIBDIR)/$(TARGET_CFG) ] || mkdir -p $(LIBDIR)/$(TARGET_CFG)
install-exec-local: $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) install-exec-local: $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT)

20
CASA-auth-token/server/JaasSupport/Makefile.am
View File

@ -19,17 +19,14 @@
# #
####################################################################### #######################################################################
SUBDIRS = SUBDIRS = src
DIST_SUBDIRS = src src/com src/com/novell src/com/novell/casa src/com/novell/casa/jaas DIST_SUBDIRS = src
EXTRA_DIST = $(JAVAFILES) EXTRA_DIST = $(JAVAFILES)
CASAROOT = ../../.. ROOT = ../..
CASALIBDIR = $(CASAROOT)/$(LIB) LIBDIR = $(ROOT)/$(LIB)
#IDENT_ABSTRACTION_DIR = /home/jluciani/dev-local/bandit/trunk/IdentityAbstraction/build
#IDENT_ABSTRACTION_DEPENDANCIES_DIR = /home/jluciani/dev-local/bandit/trunk/commons/bin
JAVAROOT = . JAVAROOT = .
JAVAC= javac JAVAC= javac
@ -45,7 +42,7 @@ BUILDDIR = build
CLASSES = $(addprefix $(BUILDDIR)/, $(JAVAFILES:%.java=%.class)) CLASSES = $(addprefix $(BUILDDIR)/, $(JAVAFILES:%.java=%.class))
LIBS = LIBS =
CLASSPATH = $(CASALIBDIR)/java/CasaAuthToken.jar:$(LIBS) CLASSPATH = $(LIBDIR)/java/CasaAuthToken.jar:$(LIBS)
CUR_DIR := $(shell pwd) CUR_DIR := $(shell pwd)
@ -58,12 +55,13 @@ $(BUILDDIR)/%.class: %.java
$(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT): $(BUILDDIR) $(CLASSES) $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT): $(BUILDDIR) $(CLASSES)
@echo [======== Jarring $@ ========] @echo [======== Jarring $@ ========]
jar cvf $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT) -C $(BUILDDIR)/classes . jar cvf $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT) -C $(BUILDDIR)/classes .
cp $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT) $(CASALIBDIR)/java/ cp $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT) $(LIBDIR)/java/
$(BUILDDIR): $(BUILDDIR):
[ -d $(BUILDDIR) ] || mkdir -p $(BUILDDIR) [ -d $(BUILDDIR) ] || mkdir -p $(BUILDDIR)
[ -d $(BUILDDIR)/classes ] || mkdir -p $(BUILDDIR)/classes [ -d $(BUILDDIR)/classes ] || mkdir -p $(BUILDDIR)/classes
[ -d $(CASALIBDIR) ] || mkdir -p $(CASALIBDIR) [ -d $(LIBDIR) ] || mkdir -p $(LIBDIR)
[ -d $(LIBDIR)/java ] || mkdir -p $(LIBDIR)/java
install-exec-local: install-exec-local:
@ -73,7 +71,7 @@ uninstall-local:
clean-local: clean-local:
if [ -d $(BUILDDIR) ]; then rm -rf $(BUILDDIR); fi if [ -d $(BUILDDIR) ]; then rm -rf $(BUILDDIR); fi
if [ -f $(CASALIBDIR)/java/$(MODULE_NAME).$(MODULE_EXT) ]; then rm -f $(CASALIBDIR)/java/$(MODULE_NAME).$(MODULE_EXT); fi if [ -f $(LIBDIR)/java/$(MODULE_NAME).$(MODULE_EXT) ]; then rm -f $(LIBDIR)/java/$(MODULE_NAME).$(MODULE_EXT); fi
distclean-local: distclean-local:

3
CASA-auth-token/server/Makefile.am
View File

@ -20,7 +20,8 @@
# #
####################################################################### #######################################################################
SUBDIRS = AuthTokenValidate ApacheSupport PamSupport AuthTokenSvc JaasSupport SUBDIRS = AuthTokenValidate ApacheSupport PamSupport
#SUBDIRS = AuthTokenValidate ApacheSupport PamSupport AuthTokenSvc JaasSupport
DIST_SUBDIRS = AuthTokenValidate ApacheSupport PamSupport AuthTokenSvc JaasSupport DIST_SUBDIRS = AuthTokenValidate ApacheSupport PamSupport AuthTokenSvc JaasSupport

16
CASA-auth-token/server/PamSupport/linux/Makefile.am
View File

@ -31,9 +31,11 @@ SUBDIRS =
DIST_SUBDIRS = DIST_SUBDIRS =
CASAROOT = ../../../.. ROOT = ../../..
CASALIBDIR = $(CASAROOT)/$(LIB) CASAINCLUDE = ../../../../CASA/include
LIBDIR = $(ROOT)/$(LIB)
# handle Mono secondary dependencies # handle Mono secondary dependencies
export MONO_PATH := $(MONO_PATH) export MONO_PATH := $(MONO_PATH)
@ -47,13 +49,13 @@ MODULE_EXT = so
CFILES = ../pam_authtoken.c CFILES = ../pam_authtoken.c
CSFILES_CSC := CSFILES_CSC :=
INCLUDES = -I. -I$(CASAROOT)/include INCLUDES = -I. -I$(CASAINCLUDE) -I../../../include
RESOURCES = RESOURCES =
DEFINES = -Wno-format-extra-args -fno-strict-aliasing DEFINES = -Wno-format-extra-args -fno-strict-aliasing
CFLAGS += $(INCLUDES) $(DEFINES) CFLAGS += $(INCLUDES) $(DEFINES)
LIBS = -lpthread -lpam -lcasa_s_authtoken LIBS = -lpthread -lpam -lcasa_s_authtoken
LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT) -L$(CASALIBDIR)/$(TARGET_CFG) -Xlinker -rpath -Xlinker /opt/novell/CASA/lib LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT) -L$(LIBDIR)/$(TARGET_CFG) -Xlinker -rpath
OBJDIR = ./$(TARGET_CFG)/$(LIB) OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o)) OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o))
@ -79,12 +81,12 @@ $(OBJDIR)/%.o: %.cpp
$(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT): $(OBJDIR) $(OBJS) $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT): $(OBJDIR) $(OBJS)
@echo [======== Linking $@ ========] @echo [======== Linking $@ ========]
$(LINK) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) $(LINK) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
cp -f $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) $(CASALIBDIR)/$(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT) cp -f $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) $(LIBDIR)/$(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT)
$(OBJDIR): $(OBJDIR):
[ -d $(OBJDIR) ] || mkdir -p $(OBJDIR) [ -d $(OBJDIR) ] || mkdir -p $(OBJDIR)
[ -d $(CASALIBDIR) ] || mkdir -p $(CASALIBDIR) [ -d $(LIBDIR) ] || mkdir -p $(LIBDIR)
[ -d $(CASALIBDIR)/$(TARGET_CFG) ] || mkdir -p $(CASALIBDIR)/$(TARGET_CFG) [ -d $(LIBDIR)/$(TARGET_CFG) ] || mkdir -p $(LIBDIR)/$(TARGET_CFG)
install-exec-local: $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) install-exec-local: $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT)
$(mkinstalldirs) $(DESTDIR)$(libdir) $(mkinstalldirs) $(DESTDIR)$(libdir)