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

sync up changes from the build submitted to Germany

Browse Source
This commit is contained in:
soochoi
2006-03-28 17:36:31 +00:00
parent 0b3db62210
commit 189777ec3c
24 changed files with 83 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@@ -35,13 +35,9 @@ EXTRA_DIST = include include/*.h \
doc/*txt doc/*.pdf \ doc/*txt doc/*.pdf \
Readme*.txt autogen.sh Readme*.txt autogen.sh
if cpu_64 CASALIBDIR = $(LIB)
CASALIBDIR = lib64
else
CASALIBDIR = lib
endif
if cpu_64 if LIB64
CASABINDIR = bin64 CASABINDIR = bin64
else else
CASABINDIR = bin CASABINDIR = bin

16
auth_token/PAM/linux/Makefile.am
View File

@@ -33,11 +33,7 @@ DIST_SUBDIRS =
CASAROOT = ../../.. CASAROOT = ../../..
if cpu_64 CASALIBDIR = $(CASAROOT)/$(LIB)
CASALIBDIR = $(CASAROOT)/lib64
else
CASALIBDIR = $(CASAROOT)/lib
endif
# handle Mono secondary dependencies # handle Mono secondary dependencies
export MONO_PATH := $(MONO_PATH) export MONO_PATH := $(MONO_PATH)
@@ -56,14 +52,10 @@ 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 -lc -lpam -lcasa_auth_token LIBS = -lpthread -lpam -lcasa_auth_token
LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT) -L$(CASALIBDIR)/$(TARGET_CFG) LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT) -L$(CASALIBDIR)/$(TARGET_CFG)
if cpu_64 OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJDIR = ./$(TARGET_CFG)/lib64
else
OBJDIR = ./$(TARGET_CFG)/lib
endif
OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o)) OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o))
EXTRA_DIST = $(CFILES) EXTRA_DIST = $(CFILES)

17
auth_token/krb5_token/linux/Makefile.am
View File

@@ -33,11 +33,7 @@ DIST_SUBDIRS =
CASAROOT = ../../.. CASAROOT = ../../..
if cpu_64 CASALIBDIR = $(CASAROOT)/$(LIB)
CASALIBDIR = $(CASAROOT)/lib64
else
CASALIBDIR = $(CASAROOT)/lib
endif
# handle Mono secondary dependencies # handle Mono secondary dependencies
export MONO_PATH := $(MONO_PATH) export MONO_PATH := $(MONO_PATH)
@@ -61,15 +57,10 @@ DEFINES = -fPIC -DPIC -DSSCS_LINUX_PLAT_F -02 -fmessage-length=0 -Wall \
-DN_PLAT_UNIX -DUNIX -DLINUX -DIAPX386 -DN_PLAT_UNIX -DUNIX -DLINUX -DIAPX386
CFLAGS += $(INCLUDES) $(DEFINES) CFLAGS += $(INCLUDES) $(DEFINES)
LIBS = -lpthread -lc -lgssapi LIBS = -lpthread -lgssapi
LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT) LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT)
if cpu_64
OBJDIR = ./$(TARGET_CFG)/lib64
else
OBJDIR = ./$(TARGET_CFG)/lib
endif
OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o)) OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o))
EXTRA_DIST = $(CFILES) *.h EXTRA_DIST = $(CFILES) *.h

16
auth_token/linux/Makefile.am
View File

@@ -33,11 +33,7 @@ DIST_SUBDIRS =
CASAROOT = ../.. CASAROOT = ../..
if cpu_64 CASALIBDIR = $(CASAROOT)/$(LIB)
CASALIBDIR = $(CASAROOT)/lib64
else
CASALIBDIR = $(CASAROOT)/lib
endif
# handle Mono secondary dependencies # handle Mono secondary dependencies
export MONO_PATH := $(MONO_PATH) export MONO_PATH := $(MONO_PATH)
@@ -56,14 +52,10 @@ INCLUDES = -I. -I.. -I$(CASAROOT)/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 -lc -ldl LIBS = -lpthread -ldl
LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT) LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT)
if cpu_64 OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJDIR = ./$(TARGET_CFG)/lib64
else
OBJDIR = ./$(TARGET_CFG)/lib
endif
OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o)) OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o))
EXTRA_DIST = $(CFILES) *.h EXTRA_DIST = $(CFILES) *.h

13
c_adlib/Makefile.am
View File

@@ -32,11 +32,7 @@ DIST_SUBDIRS = ad_kw ad_gk ad_ff
CASAROOT = .. CASAROOT = ..
if cpu_64 CASALIBDIR = $(CASAROOT)/$(LIB)
CASALIBDIR = $(CASAROOT)/lib64
else
CASALIBDIR = $(CASAROOT)/lib
endif
EXTRA_DIST = $(CSFILES) EXTRA_DIST = $(CSFILES)
@@ -71,12 +67,7 @@ CS_LIBPATH = $(CASALIBDIR)/$(TARGET_CFG) $(srcdir)/ad_gk/$(TARGET_CFG) $(srcdir)
$(srcdir)/ad_ff/$(TARGET_CFG) $(srcdir)/ad_ff/$(TARGET_CFG)
if cpu_64 OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJDIR = ./$(TARGET_CFG)/lib64
else
OBJDIR = ./$(TARGET_CFG)/lib
endif
#OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs)) #OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs))

13
c_adlib/ad_ff/Makefile.am
View File

@@ -34,11 +34,7 @@ EXTRA_DIST = $(CSFILES)
CASAROOT = ../.. CASAROOT = ../..
if cpu_64 CASALIBDIR = $(CASAROOT)/$(LIB)
CASALIBDIR = $(CASAROOT)/lib64
else
CASALIBDIR = $(CASAROOT)/lib
endif
# handle Mono secondary dependencies # handle Mono secondary dependencies
export MONO_PATH := $(MONO_PATH) export MONO_PATH := $(MONO_PATH)
@@ -58,12 +54,7 @@ CS_RESOURCES =
CS_LIBS = CS_LIBS =
CS_LIBPATH = CS_LIBPATH =
if cpu_64 OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJDIR = ./$(TARGET_CFG)/lib64
else
OBJDIR = ./$(TARGET_CFG)/lib
endif
#OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs)) #OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs))

24
c_adlib/ad_ff/native/Makefile.am
View File

@@ -33,11 +33,7 @@ EXTRA_DIST = $(CXXFILES) *.h
CASAROOT = ../../.. CASAROOT = ../../..
if cpu_64 CASALIBDIR = $(CASAROOT)/$(LIB)
CASALIBDIR = $(CASAROOT)/lib64
else
CASALIBDIR = $(CASAROOT)/lib
endif
BUILD_VER = 1.1.1 BUILD_VER = 1.1.1
@@ -68,21 +64,13 @@ EXTRA_CXXFLAGS = -fPIC -DPIC -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_
-DQT_NO_ASCII_CAS -O2 -fmessage-length=0 -Wall -g -D_REENTRANT \ -DQT_NO_ASCII_CAS -O2 -fmessage-length=0 -Wall -g -D_REENTRANT \
-DALIGNMENT -DN_PLAT_UNIX -DUNIX -DLINUX -DIAPX386 -DALIGNMENT -DN_PLAT_UNIX -DUNIX -DLINUX -DIAPX386
CXX_RESOURCES = CXX_RESOURCES =
LIBS = -lpthread -lc -ldl -L/opt/kde3/lib LIBS = -lpthread -ldl -L/opt/kde3/lib
LDFLAGS = -fno-exception -fno-check-new -Wl,-Bsymbolic -shared -pthread -O2 \ LDFLAGS = -fno-exception -fno-check-new -Wl,-Bsymbolic -shared -pthread -O2 \
-Wl,-rpath -Wl,/usr/lib -Wl,-soname -Wl,libkwallets_rw.so.1 -Wl,-soname -Wl,libkwallets_rw.so.1
if cpu_64 EXTRA_LDFLAGS = -L/usr/$(LIB) -lqt-mt -L/usr/X11R6/$(LIB) -L/usr/lib/qt3/$(LIB)
EXTRA_LDFLAGS = -L/usr/lib64 -lqt-mt -L/usr/X11R6/lib64 -L/usr/lib/qt3/lib64
else OBJDIR = ./$(TARGET_CFG)/$(LIB)
EXTRA_LddDFLAGS = -L/usr/lib -lqt-mt -L/usr/X11R6/lib -L/usr/lib/qt3/lib
endif
if cpu_64
OBJDIR = ./$(TARGET_CFG)/lib64
else
OBJDIR = ./$(TARGET_CFG)/lib
endif
OBJS = $(addprefix $(OBJDIR)/, $(CXXFILES:%.cpp=%.o)) OBJS = $(addprefix $(OBJDIR)/, $(CXXFILES:%.cpp=%.o))

13
c_adlib/ad_gk/Makefile.am
View File

@@ -34,11 +34,7 @@ EXTRA_DIST = $(CSFILES)
CASAROOT = ../.. CASAROOT = ../..
if cpu_64 CASALIBDIR = $(CASAROOT)/$(LIB)
CASALIBDIR = $(CASAROOT)/lib64
else
CASALIBDIR = $(CASAROOT)/lib
endif
# handle Mono secondary dependencies # handle Mono secondary dependencies
export MONO_PATH := $(MONO_PATH) export MONO_PATH := $(MONO_PATH)
@@ -57,12 +53,7 @@ CS_RESOURCES =
CS_LIBS = CS_LIBS =
CS_LIBPATH = CS_LIBPATH =
if cpu_64 OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJDIR = ./$(TARGET_CFG)/lib64
else
OBJDIR = ./$(TARGET_CFG)/lib
endif
#OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs)) #OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs))

14
c_adlib/ad_gk/native/Makefile.am
View File

@@ -32,11 +32,7 @@ DIST_SUBDIRS =
CASAROOT = ../../.. CASAROOT = ../../..
if cpu_64 CASALIBDIR = $(CASAROOT)/$(LIB)
CASALIBDIR = $(CASAROOT)/lib64
else
CASALIBDIR = $(CASAROOT)/lib
endif
BUILD_VER = 1.1.1 BUILD_VER = 1.1.1
@@ -51,11 +47,7 @@ MODULE_EXT = so
CFILES = $(srcdir)/ad_gk.c CFILES = $(srcdir)/ad_gk.c
if cpu_64 LIBDIR = $(LIB)
LIBDIR = lib64
else
LIBDIR = lib
endif
CSFILES_CSC := CSFILES_CSC :=
INCLUDES = -I. -I.. -I$(CASAROOT)/include \ INCLUDES = -I. -I.. -I$(CASAROOT)/include \
@@ -68,7 +60,7 @@ RESOURCES =
EXTRA_CFLAGS = EXTRA_CFLAGS =
CFLAGS += $(INCLUDES) $(DEFINES) CFLAGS += $(INCLUDES) $(DEFINES)
LIBS = -lpthread -lc -ldl LIBS = -lpthread -ldl
LDFLAGS = -fno-exceptions -fno-check-new -Wl,-Bsymbolic -shared -pthread -O2 \ LDFLAGS = -fno-exceptions -fno-check-new -Wl,-Bsymbolic -shared -pthread -O2 \
-Wl,-rpath -Wl,/usr/$(LIBDIR) -Wl,-soname -Wl,libad_gk.so.1 -Wl,-rpath -Wl,/usr/$(LIBDIR) -Wl,-soname -Wl,libad_gk.so.1

12
c_adlib/ad_kw/Makefile.am
View File

@@ -34,11 +34,7 @@ EXTRA_DIST = $(CSFILES)
CASAROOT = ../.. CASAROOT = ../..
if cpu_64 CASALIBDIR = $(CASAROOT)/$(LIB)
CASALIBDIR = $(CASAROOT)/lib64
else
CASALIBDIR = $(CASAROOT)/lib
endif
# handle Mono secondary dependencies # handle Mono secondary dependencies
export MONO_PATH := $(MONO_PATH) export MONO_PATH := $(MONO_PATH)
@@ -59,11 +55,7 @@ CS_RESOURCES =
CS_LIBS = CS_LIBS =
CS_LIBPATH = CS_LIBPATH =
if cpu_64 OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJDIR = ./$(TARGET_CFG)/lib64
else
OBJDIR = ./$(TARGET_CFG)/lib
endif
#OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs)) #OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs))

25
c_adlib/ad_kw/native/Makefile.am
View File

@@ -33,11 +33,7 @@ EXTRA_DIST = $(CXXFILES) $(CXX_MOC_FILES) *.h
CASAROOT = ../../.. CASAROOT = ../../..
if cpu_64 CASALIBDIR = $(CASAROOT)/$(LIB)
CASALIBDIR = $(CASAROOT)/lib64
else
CASALIBDIR = $(CASAROOT)/lib
endif
BUILD_VER = 1.1.1 BUILD_VER = 1.1.1
@@ -66,23 +62,14 @@ EXTRA_CXXFLAGS = -fPIC -DPIC -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_
-DQT_NO_ASCII_CAS -O2 -fmessage-length=0 -Wall -g -D_REENTRANT \ -DQT_NO_ASCII_CAS -O2 -fmessage-length=0 -Wall -g -D_REENTRANT \
-DALIGNMENT -DN_PLAT_UNIX -DUNIX -DLINUX -DIAPX386 -DALIGNMENT -DN_PLAT_UNIX -DUNIX -DLINUX -DIAPX386
CXX_RESOURCES = CXX_RESOURCES =
LIBS = -lpthread -lc -ldl -L/opt/kde3/lib LIBS = -lpthread -ldl
LDFLAGS = -fno-exception -fno-check-new -Wl,-Bsymbolic -shared -pthread -O2 \ LDFLAGS = -fno-exception -fno-check-new -Wl,-Bsymbolic -shared -pthread -O2 \
-Wl,-rpath -Wl,/usr/lib -Wl,-soname -Wl,libkwallets_rw.so.1 -Wl,-soname -Wl,libkwallets_rw.so.1
if cpu_64 EXTRA_LDFLAGS = -L/opt/kde3/$(LIB) -lkwalletclient \
EXTRA_LDFLAGS = -L/usr/lib64 -lpthread -lc -ldl -L/opt/kde3/lib64 -lkwalletclient \ -lqt-mt -L/usr/X11R6/$(LIB) -L/usr/lib/qt3/$(LIB) -lqt-mt
-lqt-mt -L/usr/X11R6/lib64 -L/usr/lib/qt3/lib64 -lqt-mt
else
EXTRA_LDFLAGS = -L/usr/lib -lpthread -lc -ldl -L/opt/kde3/lib -lkwalletclient \
-lqt-mt -L/usr/X11R6/lib -L/usr/lib/qt3/lib -lqt-mt
endif
if cpu_64 OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJDIR = ./$(TARGET_CFG)/lib64
else
OBJDIR = ./$(TARGET_CFG)/lib
endif
OBJS = $(addprefix $(OBJDIR)/, $(CXXFILES:%.cpp=%.o)) OBJS = $(addprefix $(OBJDIR)/, $(CXXFILES:%.cpp=%.o))

16
c_common/linux/Makefile.am
View File

@@ -33,11 +33,7 @@ EXTRA_DIST = $(CFILES)
CASAROOT = ../.. CASAROOT = ../..
if cpu_64 CASALIBDIR = $(CASAROOT)/$(LIB)
CASALIBDIR = $(CASAROOT)/lib64
else
CASALIBDIR = $(CASAROOT)/lib
endif
# handle Mono secondary dependencies # handle Mono secondary dependencies
export MONO_PATH := $(MONO_PATH) export MONO_PATH := $(MONO_PATH)
@@ -55,14 +51,10 @@ INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/opt/gnome/include/gnome-keyring-1/
EXTRA_CFLAGS = EXTRA_CFLAGS =
RESOURCES = RESOURCES =
CFLAGS += $(EXTRA_CFLAGS) $(INCLUDES) $(DEFINES) CFLAGS += $(EXTRA_CFLAGS) $(INCLUDES) $(DEFINES)
LIBS = -lpthread -lc -ldl LIBS = -lpthread -ldl
LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT) LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT)
if cpu_64 OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJDIR = ./$(TARGET_CFG)/lib64
else
OBJDIR = ./$(TARGET_CFG)/lib
endif

14
c_gui/Makefile.am
View File

@@ -40,13 +40,9 @@ EXTRA_DIST = $(CSFILES) *.sh CASAManager.* help/en/*.htm help/en/*.gif \
CASAROOT = .. CASAROOT = ..
if cpu_64 CASALIBDIR = $(CASAROOT)/$(LIB)/$(TARGET_CFG)
CASALIBDIR = $(CASAROOT)/lib64/$(TARGET_CFG)
else
CASALIBDIR = $(CASAROOT)/lib/$(TARGET_CFG)
endif
if cpu_64 if LIB64
CASABINDIR = $(CASAROOT)/bin64 CASABINDIR = $(CASAROOT)/bin64
else else
CASABINDIR = $(CASAROOT)/bin CASABINDIR = $(CASAROOT)/bin
@@ -87,11 +83,7 @@ CS_LIBS =$(CASALIBDIR)/Novell.CASA.Common.dll \
CS_LIBPATH = ../c_micasad/test/dependencies \ CS_LIBPATH = ../c_micasad/test/dependencies \
$(CASALIBDIR) $(CASALIBDIR)
if cpu_64 OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJDIR = ./$(TARGET_CFG)/lib64
else
OBJDIR = ./$(TARGET_CFG)/lib
endif
#OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs)) #OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs))

16
c_jwrapper/jnsscs/linux/Makefile.am
View File

@@ -33,11 +33,7 @@ EXTRA_DIST = *.exp
CASAROOT = ../../.. CASAROOT = ../../..
if cpu_64 CASALIBDIR = $(CASAROOT)/$(LIB)
CASALIBDIR = $(CASAROOT)/lib64
else
CASALIBDIR = $(CASAROOT)/lib
endif
BUILD_VER = 1.1.1 BUILD_VER = 1.1.1
@@ -58,15 +54,11 @@ INCLUDES = -I. -I.. -I$(CASAROOT)/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/
RESOURCES = RESOURCES =
DEFINES = DEFINES =
CFLAGS += $(INCLUDES) $(DEFINES) CFLAGS += $(INCLUDES) $(DEFINES)
LIBS = -lpthread -lc -ldl LIBS = -lpthread -ldl
LDFLAGS = -Wl,-Bsymbolic -shared -Wl,--version-script=jmicasa_lux.exp -Wl,-rpath -Wl,/usr/lib \ LDFLAGS = -Wl,-Bsymbolic -shared -Wl,--version-script=jmicasa_lux.exp \
-L$(CASALIBDIR)/$(TARGET_CFG) -lmicasa -Wl,-soname -Wl,libjmicasa.so.1 -L$(CASALIBDIR)/$(TARGET_CFG) -lmicasa -Wl,-soname -Wl,libjmicasa.so.1
if cpu_64 OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJDIR = ./$(TARGET_CFG)/lib64
else
OBJDIR = ./$(TARGET_CFG)/lib
endif
OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o)) OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o))

12
c_jwrapper/src/Makefile.am
View File

@@ -33,11 +33,7 @@ EXTRA_DIST =$(JAVAFILES) com/novell/casa/*.java
CASAROOT = ../.. CASAROOT = ../..
if cpu_64 CASALIBDIR = $(CASAROOT)/$(LIB)
CASALIBDIR = $(CASAROOT)/lib64
else
CASALIBDIR = $(CASAROOT)/lib
endif
JAVAROOT = . JAVAROOT = .
@@ -66,11 +62,7 @@ CFLAGS += $(INCLUDES) $(DEFINES)
LIBS = LIBS =
LDFLAGS = LDFLAGS =
if cpu_64 OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJDIR = ./$(TARGET_CFG)/lib64
else
OBJDIR = ./$(TARGET_CFG)/lib
endif
OBJS = OBJS =

16
c_micasacache/linux/Makefile.am
View File

@@ -33,11 +33,7 @@ EXTRA_DIST = $(CFILES)
CASAROOT = ../.. CASAROOT = ../..
if cpu_64 CASALIBDIR = $(CASAROOT)/$(LIB)
CASALIBDIR = $(CASAROOT)/lib64
else
CASALIBDIR = $(CASAROOT)/lib
endif
# handle Mono secondary dependencies # handle Mono secondary dependencies
export MONO_PATH := $(MONO_PATH) export MONO_PATH := $(MONO_PATH)
@@ -57,14 +53,10 @@ INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/opt/gnome/include/gnome-keyring-1/
EXTRA_CFLAGS = EXTRA_CFLAGS =
RESOURCES = RESOURCES =
CFLAGS += $(EXTRA_CFLAGS) $(INCLUDES) $(DEFINES) CFLAGS += $(EXTRA_CFLAGS) $(INCLUDES) $(DEFINES)
LIBS = -lpthread -lc -ldl LIBS = -lpthread -ldl
LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT) LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT)
if cpu_64 OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJDIR = ./$(TARGET_CFG)/lib64
else
OBJDIR = ./$(TARGET_CFG)/lib
endif
OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o)) OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o))

16
c_micasad/Makefile.am
View File

@@ -41,13 +41,9 @@ startup/micasad* startup/casacfgpam startup/casaucfgpam
CASAROOT = .. CASAROOT = ..
if cpu_64 CASALIBDIR = $(CASAROOT)/$(LIB)
CASALIBDIR = $(CASAROOT)/lib64
else
CASALIBDIR = $(CASAROOT)/lib
endif
if cpu_64 if LIB64
CASABINDIR = $(CASAROOT)/bin64 CASABINDIR = $(CASAROOT)/bin64
else else
CASABINDIR = $(CASAROOT)/bin CASABINDIR = $(CASAROOT)/bin
@@ -132,16 +128,12 @@ CS_LIBS =Mono.Posix.dll \
nunit.extensions.dll \ nunit.extensions.dll \
nunit.util.dll \ nunit.util.dll \
nunit.mocks.dll \ nunit.mocks.dll \
$(CASALIBDIR)/$(TARGET_CFG)/Novell.CASA.Common.dll \ $(CASALIBDIR)/$(TARGET_CFG)/Novell.CASA.Common.dll \
$(CASALIBDIR)/$(TARGET_CFG)/Novell.CASA.DataEngines.GnomeKeyring.dll $(CASALIBDIR)/$(TARGET_CFG)/Novell.CASA.DataEngines.GnomeKeyring.dll
CS_LIBPATH = $(CASALIBDIR)/$(TARGET_CFG) $(srcdir)/test/dependencies CS_LIBPATH = $(CASALIBDIR)/$(TARGET_CFG) $(srcdir)/test/dependencies
if cpu_64 OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJDIR = ./$(TARGET_CFG)/lib64
else
OBJDIR = ./$(TARGET_CFG)/lib
endif
CUR_DIR := $(shell pwd) CUR_DIR := $(shell pwd)

12
c_micasad/lib/Makefile.am
View File

@@ -34,11 +34,7 @@ EXTRA_DIST = $(CSFILES)
CASAROOT = ../.. CASAROOT = ../..
if cpu_64 CASALIBDIR = $(CASAROOT)/$(LIB)
CASALIBDIR = $(CASAROOT)/lib64
else
CASALIBDIR = $(CASAROOT)/lib
endif
# handle Mono secondary dependencies # handle Mono secondary dependencies
export MONO_PATH := $(MONO_PATH) export MONO_PATH := $(MONO_PATH)
@@ -68,11 +64,7 @@ CS_RESOURCES =
CS_LIBS = CS_LIBS =
CS_LIBPATH = CS_LIBPATH =
if cpu_64 OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJDIR = ./$(TARGET_CFG)/lib64
else
OBJDIR = ./$(TARGET_CFG)/lib
endif
#OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs)) #OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs))

13
c_micasadk/linux/Makefile.am
View File

@@ -33,13 +33,8 @@ EXTRA_DIST = *.exp
CASAROOT = ../.. CASAROOT = ../..
if cpu_64 CASALIBDIR = $(CASAROOT)/$(LIB)
CASALIBDIR = $(CASAROOT)/lib64 OBJDIR = $(TARGET_CFG)/$(LIB)
OBJDIR = $(TARGET_CFG)/lib64
else
CASALIBDIR = $(CASAROOT)/lib
OBJDIR = $(TARGET_CFG)/lib
endif
BUILD_VER = 1.1.1 BUILD_VER = 1.1.1
@@ -63,8 +58,8 @@ CFLAGS += $(EXTRA_CFLAGS) $(INCLUDES) $(DEFINES)
LIBS = -L/$(CASALIBDIR)/$(TARGET_CFG) LIBS = -L/$(CASALIBDIR)/$(TARGET_CFG)
LDFLAGS = -Wl,-Bsymbolic -shared -Wl,--version-script=micasa_lux.exp \ LDFLAGS = -Wl,-Bsymbolic -shared -Wl,--version-script=micasa_lux.exp \
-Wl,-rpath -Wl,/usr/lib -L/usr/lib -lpthread \ -lpthread \
-lc -ldl -Wl,-soname -Wl,libmicasa.so.1 -ldl -Wl,-soname -Wl,libmicasa.so.1
OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o)) OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o))
#COMMON_OBJS = -L/../../c_common/linux/$(OBJDIR) ../../c_common/linux/$(OBJDIR)/sscs_ll.o #COMMON_OBJS = -L/../../c_common/linux/$(OBJDIR) ../../c_common/linux/$(OBJDIR)/sscs_ll.o
COMMON_OBJS = $(OBJDIR)/sscs_ll.o COMMON_OBJS = $(OBJDIR)/sscs_ll.o

12
c_policy/Makefile.am
View File

@@ -34,11 +34,7 @@ EXTRA_DIST = *.cs $(CSFILES)
CASAROOT = .. CASAROOT = ..
if cpu_64 CASALIBDIR = $(CASAROOT)/$(LIB)
CASALIBDIR = $(CASAROOT)/lib64
else
CASALIBDIR = $(CASAROOT)/lib
endif
# handle Mono secondary dependencies # handle Mono secondary dependencies
export MONO_PATH := $(MONO_PATH) export MONO_PATH := $(MONO_PATH)
@@ -64,11 +60,7 @@ CS_RESOURCES =
CS_LIBS = CS_LIBS =
CS_LIBPATH = CS_LIBPATH =
if cpu_64 OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJDIR = ./$(TARGET_CFG)/lib64
else
OBJDIR = ./$(TARGET_CFG)/lib
endif
#OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs)) #OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs))

12
c_sharp/NSSCSWrapper/Makefile.am
View File

@@ -34,11 +34,7 @@ EXTRA_DIST = *.cs $(CSFILES)
CASAROOT = ../.. CASAROOT = ../..
if cpu_64 CASALIBDIR = $(CASAROOT)/$(LIB)
CASALIBDIR = $(CASAROOT)/lib64
else
CASALIBDIR = $(CASAROOT)/lib
endif
# handle Mono secondary dependencies # handle Mono secondary dependencies
export MONO_PATH := $(MONO_PATH) export MONO_PATH := $(MONO_PATH)
@@ -63,11 +59,7 @@ CS_RESOURCES =
CS_LIBS =$(CASALIBDIR)/$(TARGET_CFG)/Novell.CASA.Common.dll CS_LIBS =$(CASALIBDIR)/$(TARGET_CFG)/Novell.CASA.Common.dll
CS_LIBPATH = $(CASALIBDIR)/$(TARGET_CFG) CS_LIBPATH = $(CASALIBDIR)/$(TARGET_CFG)
if cpu_64 OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJDIR = ./$(TARGET_CFG)/lib64
else
OBJDIR = ./$(TARGET_CFG)/lib
endif
#OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs)) #OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs))

11
configure.in
View File

@@ -111,16 +111,15 @@ AM_CONDITIONAL(WINDOWS, test "$TARGET_OS" = "windows")
case $target_cpu in case $target_cpu in
x86_64|p*pc64|s390x) x86_64|p*pc64|s390x)
TARGET_ARCH='cpu_64' LIB=lib64
;; ;;
*ia64|*) *ia64|*)
TARGET_ARCH='cpu_non64' LIB=lib
;; ;;
esac esac
AC_SUBST(TARGET_ARCH) AC_SUBST(LIB)
AM_CONDITIONAL(cpu_64, test "$TARGET_ARCH" = "cpu_64") AM_CONDITIONAL(LIB64, test "$LIB" = lib64)
AM_CONDITIONAL(cpu_non64, test "$TARGET_ARCH" = "cpu_non64")
# #
# #
@@ -139,7 +138,7 @@ case $TARGET_OS in
ICON_FLAG='/resource:' ICON_FLAG='/resource:'
PLATFORM_SUBDIRS=$LINUX_SUBDIRS PLATFORM_SUBDIRS=$LINUX_SUBDIRS
SEP='/' SEP='/'
LINK=ld LINK=gcc
;; ;;
# #
# Windows-specific configuration # Windows-specific configuration

15
login_capture/PAM/linux/Makefile.am
View File

@@ -34,11 +34,7 @@ EXTRA_DIST = *.exp
CASAROOT = ../../.. CASAROOT = ../../..
if cpu_64 CASALIBDIR = $(CASAROOT)/$(LIB)
CASALIBDIR = $(CASAROOT)/lib64
else
CASALIBDIR = $(CASAROOT)/lib
endif
# handle Mono secondary dependencies # handle Mono secondary dependencies
export MONO_PATH := $(MONO_PATH) export MONO_PATH := $(MONO_PATH)
@@ -60,13 +56,10 @@ CFLAGS += $(INCLUDES) $(DEFINES)
LIBS = LIBS =
LDFLAGS = -Wl,-Bsymbolic -shared -Wl,--version-script=pam_micasa_lux.exp \ LDFLAGS = -Wl,-Bsymbolic -shared -Wl,--version-script=pam_micasa_lux.exp \
-Wl,-rpath -Wl,/usr/lib -L/usr/lib -lpthread -lc -ldl \ -lpthread -ldl \
-lpam -Wl,-soname -Wl,pam_micasa.so -lpam -Wl,-soname -Wl,pam_micasa.so
if cpu_64
OBJDIR = ./$(TARGET_CFG)/lib64 OBJDIR = ./$(TARGET_CFG)/$(LIB)
else
OBJDIR = ./$(TARGET_CFG)/lib
endif
OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o)) OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o))
CUR_DIR := $(shell pwd) CUR_DIR := $(shell pwd)

13
package/linux/CASA.spec.in
View File

@@ -28,7 +28,7 @@ Version: @VERSION@
Release: 0 Release: 0
Summary: Novell Common Authentication Service Adapter (CASA) Summary: Novell Common Authentication Service Adapter (CASA)
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
#Patch: %{name}-%{version}.dif Patch: %{name}-%{version}.diff
#Patch2: CASA-detect_lib64.patch #Patch2: CASA-detect_lib64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: mono >= 1.1.13 mono-core >= 1.1.13 Requires: mono >= 1.1.13 mono-core >= 1.1.13
@@ -69,7 +69,7 @@ to one another.
%prep %prep
%setup -q %setup -q
#%patch2 %patch
%if %{_lib} == "lib64" %if %{_lib} == "lib64"
%define binsource bin64 %define binsource bin64
%else %else
@@ -169,10 +169,8 @@ install c_gui/CASAManager.desktop %{buildroot}/usr/share/applications
%suse_update_desktop_file CASAManager %suse_update_desktop_file CASAManager
%post %post
echo " "
%{fillup_and_insserv -y micasad} %{fillup_and_insserv -y micasad}
echo " " #if [ "x$1" = "x1" ] || [ "x$1" = "x2" ]
#if [ "x$1" == "x1" ] || [ "x$1" == "x2" ]
#then #then
# casacfgpam # casacfgpam
#fi #fi
@@ -181,9 +179,10 @@ echo " "
%post gui %post gui
/sbin/ldconfig /sbin/ldconfig
%preun %preun
%stop_on_removal micasad %stop_on_removal micasad
if [ "x$1" == "x0" ] if [ "x$1" = "x0" ]
then then
/usr/sbin/casaucfgpam /usr/sbin/casaucfgpam
fi fi
@@ -191,12 +190,12 @@ fi
%postun %postun
%restart_on_update %restart_on_update
%insserv_cleanup %insserv_cleanup
/sbin/ldconfig /sbin/ldconfig
%postun gui %postun gui
/sbin/ldconfig /sbin/ldconfig
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT