From 189777ec3c7c0b5500da5c035e1e5a43e802dc3d Mon Sep 17 00:00:00 2001 From: soochoi Date: Tue, 28 Mar 2006 17:36:31 +0000 Subject: [PATCH] sync up changes from the build submitted to Germany --- Makefile.am | 8 ++------ auth_token/PAM/linux/Makefile.am | 16 ++++------------ auth_token/krb5_token/linux/Makefile.am | 17 ++++------------- auth_token/linux/Makefile.am | 16 ++++------------ c_adlib/Makefile.am | 13 ++----------- c_adlib/ad_ff/Makefile.am | 13 ++----------- c_adlib/ad_ff/native/Makefile.am | 24 ++++++------------------ c_adlib/ad_gk/Makefile.am | 13 ++----------- c_adlib/ad_gk/native/Makefile.am | 14 +++----------- c_adlib/ad_kw/Makefile.am | 12 ++---------- c_adlib/ad_kw/native/Makefile.am | 25 ++++++------------------- c_common/linux/Makefile.am | 16 ++++------------ c_gui/Makefile.am | 14 +++----------- c_jwrapper/jnsscs/linux/Makefile.am | 16 ++++------------ c_jwrapper/src/Makefile.am | 12 ++---------- c_micasacache/linux/Makefile.am | 16 ++++------------ c_micasad/Makefile.am | 16 ++++------------ c_micasad/lib/Makefile.am | 12 ++---------- c_micasadk/linux/Makefile.am | 13 ++++--------- c_policy/Makefile.am | 12 ++---------- c_sharp/NSSCSWrapper/Makefile.am | 12 ++---------- configure.in | 11 +++++------ login_capture/PAM/linux/Makefile.am | 15 ++++----------- package/linux/CASA.spec.in | 13 ++++++------- 24 files changed, 83 insertions(+), 266 deletions(-) diff --git a/Makefile.am b/Makefile.am index e5f96e1d..4026281e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,13 +35,9 @@ EXTRA_DIST = include include/*.h \ doc/*txt doc/*.pdf \ Readme*.txt autogen.sh -if cpu_64 -CASALIBDIR = lib64 -else -CASALIBDIR = lib -endif +CASALIBDIR = $(LIB) -if cpu_64 +if LIB64 CASABINDIR = bin64 else CASABINDIR = bin diff --git a/auth_token/PAM/linux/Makefile.am b/auth_token/PAM/linux/Makefile.am index 9e49456d..d713c3db 100644 --- a/auth_token/PAM/linux/Makefile.am +++ b/auth_token/PAM/linux/Makefile.am @@ -33,11 +33,7 @@ DIST_SUBDIRS = CASAROOT = ../../.. -if cpu_64 -CASALIBDIR = $(CASAROOT)/lib64 -else -CASALIBDIR = $(CASAROOT)/lib -endif +CASALIBDIR = $(CASAROOT)/$(LIB) # handle Mono secondary dependencies export MONO_PATH := $(MONO_PATH) @@ -56,14 +52,10 @@ RESOURCES = DEFINES = -Wno-format-extra-args -fno-strict-aliasing CFLAGS += $(INCLUDES) $(DEFINES) -LIBS = -lpthread -lc -lpam -lcasa_auth_token -LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT) -L$(CASALIBDIR)/$(TARGET_CFG) +LIBS = -lpthread -lpam -lcasa_auth_token +LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT) -L$(CASALIBDIR)/$(TARGET_CFG) -if cpu_64 -OBJDIR = ./$(TARGET_CFG)/lib64 -else -OBJDIR = ./$(TARGET_CFG)/lib -endif +OBJDIR = ./$(TARGET_CFG)/$(LIB) OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o)) EXTRA_DIST = $(CFILES) diff --git a/auth_token/krb5_token/linux/Makefile.am b/auth_token/krb5_token/linux/Makefile.am index 721e8d77..71774b26 100644 --- a/auth_token/krb5_token/linux/Makefile.am +++ b/auth_token/krb5_token/linux/Makefile.am @@ -33,11 +33,7 @@ DIST_SUBDIRS = CASAROOT = ../../.. -if cpu_64 -CASALIBDIR = $(CASAROOT)/lib64 -else -CASALIBDIR = $(CASAROOT)/lib -endif +CASALIBDIR = $(CASAROOT)/$(LIB) # handle Mono secondary dependencies 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 CFLAGS += $(INCLUDES) $(DEFINES) -LIBS = -lpthread -lc -lgssapi -LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT) - -if cpu_64 -OBJDIR = ./$(TARGET_CFG)/lib64 -else -OBJDIR = ./$(TARGET_CFG)/lib -endif +LIBS = -lpthread -lgssapi +LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT) +OBJDIR = ./$(TARGET_CFG)/$(LIB) OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o)) EXTRA_DIST = $(CFILES) *.h diff --git a/auth_token/linux/Makefile.am b/auth_token/linux/Makefile.am index 21ed605f..0ac9cfb4 100644 --- a/auth_token/linux/Makefile.am +++ b/auth_token/linux/Makefile.am @@ -33,11 +33,7 @@ DIST_SUBDIRS = CASAROOT = ../.. -if cpu_64 -CASALIBDIR = $(CASAROOT)/lib64 -else -CASALIBDIR = $(CASAROOT)/lib -endif +CASALIBDIR = $(CASAROOT)/$(LIB) # handle Mono secondary dependencies export MONO_PATH := $(MONO_PATH) @@ -56,14 +52,10 @@ INCLUDES = -I. -I.. -I$(CASAROOT)/include RESOURCES = DEFINES = -Wno-format-extra-args -fno-strict-aliasing CFLAGS += $(INCLUDES) $(DEFINES) -LIBS = -lpthread -lc -ldl -LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT) +LIBS = -lpthread -ldl +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)) EXTRA_DIST = $(CFILES) *.h diff --git a/c_adlib/Makefile.am b/c_adlib/Makefile.am index 89d39205..d858313e 100644 --- a/c_adlib/Makefile.am +++ b/c_adlib/Makefile.am @@ -32,11 +32,7 @@ DIST_SUBDIRS = ad_kw ad_gk ad_ff CASAROOT = .. -if cpu_64 -CASALIBDIR = $(CASAROOT)/lib64 -else -CASALIBDIR = $(CASAROOT)/lib -endif +CASALIBDIR = $(CASAROOT)/$(LIB) EXTRA_DIST = $(CSFILES) @@ -71,12 +67,7 @@ CS_LIBPATH = $(CASALIBDIR)/$(TARGET_CFG) $(srcdir)/ad_gk/$(TARGET_CFG) $(srcdir) $(srcdir)/ad_ff/$(TARGET_CFG) -if cpu_64 -OBJDIR = ./$(TARGET_CFG)/lib64 -else -OBJDIR = ./$(TARGET_CFG)/lib -endif - +OBJDIR = ./$(TARGET_CFG)/$(LIB) #OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs)) diff --git a/c_adlib/ad_ff/Makefile.am b/c_adlib/ad_ff/Makefile.am index b8832609..5e4d7f8e 100644 --- a/c_adlib/ad_ff/Makefile.am +++ b/c_adlib/ad_ff/Makefile.am @@ -34,11 +34,7 @@ EXTRA_DIST = $(CSFILES) CASAROOT = ../.. -if cpu_64 -CASALIBDIR = $(CASAROOT)/lib64 -else -CASALIBDIR = $(CASAROOT)/lib -endif +CASALIBDIR = $(CASAROOT)/$(LIB) # handle Mono secondary dependencies export MONO_PATH := $(MONO_PATH) @@ -58,12 +54,7 @@ CS_RESOURCES = CS_LIBS = CS_LIBPATH = -if cpu_64 -OBJDIR = ./$(TARGET_CFG)/lib64 -else -OBJDIR = ./$(TARGET_CFG)/lib -endif - +OBJDIR = ./$(TARGET_CFG)/$(LIB) #OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs)) diff --git a/c_adlib/ad_ff/native/Makefile.am b/c_adlib/ad_ff/native/Makefile.am index 587f1152..f5837766 100644 --- a/c_adlib/ad_ff/native/Makefile.am +++ b/c_adlib/ad_ff/native/Makefile.am @@ -33,11 +33,7 @@ EXTRA_DIST = $(CXXFILES) *.h CASAROOT = ../../.. -if cpu_64 -CASALIBDIR = $(CASAROOT)/lib64 -else -CASALIBDIR = $(CASAROOT)/lib -endif +CASALIBDIR = $(CASAROOT)/$(LIB) 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 \ -DALIGNMENT -DN_PLAT_UNIX -DUNIX -DLINUX -DIAPX386 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 \ - -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/lib64 -lqt-mt -L/usr/X11R6/lib64 -L/usr/lib/qt3/lib64 -else -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 +EXTRA_LDFLAGS = -L/usr/$(LIB) -lqt-mt -L/usr/X11R6/$(LIB) -L/usr/lib/qt3/$(LIB) + +OBJDIR = ./$(TARGET_CFG)/$(LIB) OBJS = $(addprefix $(OBJDIR)/, $(CXXFILES:%.cpp=%.o)) diff --git a/c_adlib/ad_gk/Makefile.am b/c_adlib/ad_gk/Makefile.am index 27a06fa5..5e3e1b5f 100644 --- a/c_adlib/ad_gk/Makefile.am +++ b/c_adlib/ad_gk/Makefile.am @@ -34,11 +34,7 @@ EXTRA_DIST = $(CSFILES) CASAROOT = ../.. -if cpu_64 -CASALIBDIR = $(CASAROOT)/lib64 -else -CASALIBDIR = $(CASAROOT)/lib -endif +CASALIBDIR = $(CASAROOT)/$(LIB) # handle Mono secondary dependencies export MONO_PATH := $(MONO_PATH) @@ -57,12 +53,7 @@ CS_RESOURCES = CS_LIBS = CS_LIBPATH = -if cpu_64 -OBJDIR = ./$(TARGET_CFG)/lib64 -else -OBJDIR = ./$(TARGET_CFG)/lib -endif - +OBJDIR = ./$(TARGET_CFG)/$(LIB) #OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs)) diff --git a/c_adlib/ad_gk/native/Makefile.am b/c_adlib/ad_gk/native/Makefile.am index 76d6d85c..403b10fd 100644 --- a/c_adlib/ad_gk/native/Makefile.am +++ b/c_adlib/ad_gk/native/Makefile.am @@ -32,11 +32,7 @@ DIST_SUBDIRS = CASAROOT = ../../.. -if cpu_64 -CASALIBDIR = $(CASAROOT)/lib64 -else -CASALIBDIR = $(CASAROOT)/lib -endif +CASALIBDIR = $(CASAROOT)/$(LIB) BUILD_VER = 1.1.1 @@ -51,11 +47,7 @@ MODULE_EXT = so CFILES = $(srcdir)/ad_gk.c -if cpu_64 -LIBDIR = lib64 -else -LIBDIR = lib -endif +LIBDIR = $(LIB) CSFILES_CSC := INCLUDES = -I. -I.. -I$(CASAROOT)/include \ @@ -68,7 +60,7 @@ RESOURCES = EXTRA_CFLAGS = CFLAGS += $(INCLUDES) $(DEFINES) -LIBS = -lpthread -lc -ldl +LIBS = -lpthread -ldl LDFLAGS = -fno-exceptions -fno-check-new -Wl,-Bsymbolic -shared -pthread -O2 \ -Wl,-rpath -Wl,/usr/$(LIBDIR) -Wl,-soname -Wl,libad_gk.so.1 diff --git a/c_adlib/ad_kw/Makefile.am b/c_adlib/ad_kw/Makefile.am index c9c68166..c56a31bb 100644 --- a/c_adlib/ad_kw/Makefile.am +++ b/c_adlib/ad_kw/Makefile.am @@ -34,11 +34,7 @@ EXTRA_DIST = $(CSFILES) CASAROOT = ../.. -if cpu_64 -CASALIBDIR = $(CASAROOT)/lib64 -else -CASALIBDIR = $(CASAROOT)/lib -endif +CASALIBDIR = $(CASAROOT)/$(LIB) # handle Mono secondary dependencies export MONO_PATH := $(MONO_PATH) @@ -59,11 +55,7 @@ CS_RESOURCES = CS_LIBS = CS_LIBPATH = -if cpu_64 -OBJDIR = ./$(TARGET_CFG)/lib64 -else -OBJDIR = ./$(TARGET_CFG)/lib -endif +OBJDIR = ./$(TARGET_CFG)/$(LIB) #OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs)) diff --git a/c_adlib/ad_kw/native/Makefile.am b/c_adlib/ad_kw/native/Makefile.am index 83bc76b1..6bd76e41 100644 --- a/c_adlib/ad_kw/native/Makefile.am +++ b/c_adlib/ad_kw/native/Makefile.am @@ -33,11 +33,7 @@ EXTRA_DIST = $(CXXFILES) $(CXX_MOC_FILES) *.h CASAROOT = ../../.. -if cpu_64 -CASALIBDIR = $(CASAROOT)/lib64 -else -CASALIBDIR = $(CASAROOT)/lib -endif +CASALIBDIR = $(CASAROOT)/$(LIB) 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 \ -DALIGNMENT -DN_PLAT_UNIX -DUNIX -DLINUX -DIAPX386 CXX_RESOURCES = -LIBS = -lpthread -lc -ldl -L/opt/kde3/lib +LIBS = -lpthread -ldl 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/lib64 -lpthread -lc -ldl -L/opt/kde3/lib64 -lkwalletclient \ - -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 +EXTRA_LDFLAGS = -L/opt/kde3/$(LIB) -lkwalletclient \ + -lqt-mt -L/usr/X11R6/$(LIB) -L/usr/lib/qt3/$(LIB) -lqt-mt -if cpu_64 -OBJDIR = ./$(TARGET_CFG)/lib64 -else -OBJDIR = ./$(TARGET_CFG)/lib -endif +OBJDIR = ./$(TARGET_CFG)/$(LIB) OBJS = $(addprefix $(OBJDIR)/, $(CXXFILES:%.cpp=%.o)) diff --git a/c_common/linux/Makefile.am b/c_common/linux/Makefile.am index b6f9842e..4a773384 100644 --- a/c_common/linux/Makefile.am +++ b/c_common/linux/Makefile.am @@ -33,11 +33,7 @@ EXTRA_DIST = $(CFILES) CASAROOT = ../.. -if cpu_64 -CASALIBDIR = $(CASAROOT)/lib64 -else -CASALIBDIR = $(CASAROOT)/lib -endif +CASALIBDIR = $(CASAROOT)/$(LIB) # handle Mono secondary dependencies export MONO_PATH := $(MONO_PATH) @@ -55,14 +51,10 @@ INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/opt/gnome/include/gnome-keyring-1/ EXTRA_CFLAGS = RESOURCES = CFLAGS += $(EXTRA_CFLAGS) $(INCLUDES) $(DEFINES) -LIBS = -lpthread -lc -ldl -LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT) +LIBS = -lpthread -ldl +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) diff --git a/c_gui/Makefile.am b/c_gui/Makefile.am index 37b24e59..474fa0e7 100644 --- a/c_gui/Makefile.am +++ b/c_gui/Makefile.am @@ -40,13 +40,9 @@ EXTRA_DIST = $(CSFILES) *.sh CASAManager.* help/en/*.htm help/en/*.gif \ CASAROOT = .. -if cpu_64 -CASALIBDIR = $(CASAROOT)/lib64/$(TARGET_CFG) -else -CASALIBDIR = $(CASAROOT)/lib/$(TARGET_CFG) -endif +CASALIBDIR = $(CASAROOT)/$(LIB)/$(TARGET_CFG) -if cpu_64 +if LIB64 CASABINDIR = $(CASAROOT)/bin64 else CASABINDIR = $(CASAROOT)/bin @@ -87,11 +83,7 @@ CS_LIBS =$(CASALIBDIR)/Novell.CASA.Common.dll \ CS_LIBPATH = ../c_micasad/test/dependencies \ $(CASALIBDIR) -if cpu_64 -OBJDIR = ./$(TARGET_CFG)/lib64 -else -OBJDIR = ./$(TARGET_CFG)/lib -endif +OBJDIR = ./$(TARGET_CFG)/$(LIB) #OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs)) diff --git a/c_jwrapper/jnsscs/linux/Makefile.am b/c_jwrapper/jnsscs/linux/Makefile.am index a95623e9..558fc69a 100644 --- a/c_jwrapper/jnsscs/linux/Makefile.am +++ b/c_jwrapper/jnsscs/linux/Makefile.am @@ -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)) diff --git a/c_jwrapper/src/Makefile.am b/c_jwrapper/src/Makefile.am index 1b1ffcd3..8f377e37 100644 --- a/c_jwrapper/src/Makefile.am +++ b/c_jwrapper/src/Makefile.am @@ -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 = diff --git a/c_micasacache/linux/Makefile.am b/c_micasacache/linux/Makefile.am index afba2901..424b3eb2 100644 --- a/c_micasacache/linux/Makefile.am +++ b/c_micasacache/linux/Makefile.am @@ -33,11 +33,7 @@ EXTRA_DIST = $(CFILES) CASAROOT = ../.. -if cpu_64 -CASALIBDIR = $(CASAROOT)/lib64 -else -CASALIBDIR = $(CASAROOT)/lib -endif +CASALIBDIR = $(CASAROOT)/$(LIB) # handle Mono secondary dependencies export MONO_PATH := $(MONO_PATH) @@ -57,14 +53,10 @@ INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/opt/gnome/include/gnome-keyring-1/ EXTRA_CFLAGS = RESOURCES = CFLAGS += $(EXTRA_CFLAGS) $(INCLUDES) $(DEFINES) -LIBS = -lpthread -lc -ldl -LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT) +LIBS = -lpthread -ldl +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)) diff --git a/c_micasad/Makefile.am b/c_micasad/Makefile.am index cc460ee5..e59e64a6 100644 --- a/c_micasad/Makefile.am +++ b/c_micasad/Makefile.am @@ -41,13 +41,9 @@ startup/micasad* startup/casacfgpam startup/casaucfgpam CASAROOT = .. -if cpu_64 -CASALIBDIR = $(CASAROOT)/lib64 -else -CASALIBDIR = $(CASAROOT)/lib -endif +CASALIBDIR = $(CASAROOT)/$(LIB) -if cpu_64 +if LIB64 CASABINDIR = $(CASAROOT)/bin64 else CASABINDIR = $(CASAROOT)/bin @@ -132,16 +128,12 @@ CS_LIBS =Mono.Posix.dll \ nunit.extensions.dll \ nunit.util.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 CS_LIBPATH = $(CASALIBDIR)/$(TARGET_CFG) $(srcdir)/test/dependencies -if cpu_64 -OBJDIR = ./$(TARGET_CFG)/lib64 -else -OBJDIR = ./$(TARGET_CFG)/lib -endif +OBJDIR = ./$(TARGET_CFG)/$(LIB) CUR_DIR := $(shell pwd) diff --git a/c_micasad/lib/Makefile.am b/c_micasad/lib/Makefile.am index 3685538c..2d7e0730 100644 --- a/c_micasad/lib/Makefile.am +++ b/c_micasad/lib/Makefile.am @@ -34,11 +34,7 @@ EXTRA_DIST = $(CSFILES) CASAROOT = ../.. -if cpu_64 -CASALIBDIR = $(CASAROOT)/lib64 -else -CASALIBDIR = $(CASAROOT)/lib -endif +CASALIBDIR = $(CASAROOT)/$(LIB) # handle Mono secondary dependencies export MONO_PATH := $(MONO_PATH) @@ -68,11 +64,7 @@ CS_RESOURCES = CS_LIBS = CS_LIBPATH = -if cpu_64 -OBJDIR = ./$(TARGET_CFG)/lib64 -else -OBJDIR = ./$(TARGET_CFG)/lib -endif +OBJDIR = ./$(TARGET_CFG)/$(LIB) #OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs)) diff --git a/c_micasadk/linux/Makefile.am b/c_micasadk/linux/Makefile.am index a84ba845..b77b3713 100644 --- a/c_micasadk/linux/Makefile.am +++ b/c_micasadk/linux/Makefile.am @@ -33,13 +33,8 @@ EXTRA_DIST = *.exp CASAROOT = ../.. -if cpu_64 -CASALIBDIR = $(CASAROOT)/lib64 -OBJDIR = $(TARGET_CFG)/lib64 -else -CASALIBDIR = $(CASAROOT)/lib -OBJDIR = $(TARGET_CFG)/lib -endif +CASALIBDIR = $(CASAROOT)/$(LIB) +OBJDIR = $(TARGET_CFG)/$(LIB) BUILD_VER = 1.1.1 @@ -63,8 +58,8 @@ CFLAGS += $(EXTRA_CFLAGS) $(INCLUDES) $(DEFINES) LIBS = -L/$(CASALIBDIR)/$(TARGET_CFG) LDFLAGS = -Wl,-Bsymbolic -shared -Wl,--version-script=micasa_lux.exp \ - -Wl,-rpath -Wl,/usr/lib -L/usr/lib -lpthread \ - -lc -ldl -Wl,-soname -Wl,libmicasa.so.1 + -lpthread \ + -ldl -Wl,-soname -Wl,libmicasa.so.1 OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o)) #COMMON_OBJS = -L/../../c_common/linux/$(OBJDIR) ../../c_common/linux/$(OBJDIR)/sscs_ll.o COMMON_OBJS = $(OBJDIR)/sscs_ll.o diff --git a/c_policy/Makefile.am b/c_policy/Makefile.am index 2ad8c591..346b0fdb 100644 --- a/c_policy/Makefile.am +++ b/c_policy/Makefile.am @@ -34,11 +34,7 @@ EXTRA_DIST = *.cs $(CSFILES) CASAROOT = .. -if cpu_64 -CASALIBDIR = $(CASAROOT)/lib64 -else -CASALIBDIR = $(CASAROOT)/lib -endif +CASALIBDIR = $(CASAROOT)/$(LIB) # handle Mono secondary dependencies export MONO_PATH := $(MONO_PATH) @@ -64,11 +60,7 @@ CS_RESOURCES = CS_LIBS = CS_LIBPATH = -if cpu_64 -OBJDIR = ./$(TARGET_CFG)/lib64 -else -OBJDIR = ./$(TARGET_CFG)/lib -endif +OBJDIR = ./$(TARGET_CFG)/$(LIB) #OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs)) diff --git a/c_sharp/NSSCSWrapper/Makefile.am b/c_sharp/NSSCSWrapper/Makefile.am index 3c37d661..fa59ef3a 100644 --- a/c_sharp/NSSCSWrapper/Makefile.am +++ b/c_sharp/NSSCSWrapper/Makefile.am @@ -34,11 +34,7 @@ EXTRA_DIST = *.cs $(CSFILES) CASAROOT = ../.. -if cpu_64 -CASALIBDIR = $(CASAROOT)/lib64 -else -CASALIBDIR = $(CASAROOT)/lib -endif +CASALIBDIR = $(CASAROOT)/$(LIB) # handle Mono secondary dependencies export MONO_PATH := $(MONO_PATH) @@ -63,11 +59,7 @@ CS_RESOURCES = CS_LIBS =$(CASALIBDIR)/$(TARGET_CFG)/Novell.CASA.Common.dll CS_LIBPATH = $(CASALIBDIR)/$(TARGET_CFG) -if cpu_64 -OBJDIR = ./$(TARGET_CFG)/lib64 -else -OBJDIR = ./$(TARGET_CFG)/lib -endif +OBJDIR = ./$(TARGET_CFG)/$(LIB) #OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs)) diff --git a/configure.in b/configure.in index 2159133f..e0e82dd8 100644 --- a/configure.in +++ b/configure.in @@ -111,16 +111,15 @@ AM_CONDITIONAL(WINDOWS, test "$TARGET_OS" = "windows") case $target_cpu in x86_64|p*pc64|s390x) - TARGET_ARCH='cpu_64' + LIB=lib64 ;; *ia64|*) - TARGET_ARCH='cpu_non64' + LIB=lib ;; esac -AC_SUBST(TARGET_ARCH) -AM_CONDITIONAL(cpu_64, test "$TARGET_ARCH" = "cpu_64") -AM_CONDITIONAL(cpu_non64, test "$TARGET_ARCH" = "cpu_non64") +AC_SUBST(LIB) +AM_CONDITIONAL(LIB64, test "$LIB" = lib64) # # @@ -139,7 +138,7 @@ case $TARGET_OS in ICON_FLAG='/resource:' PLATFORM_SUBDIRS=$LINUX_SUBDIRS SEP='/' - LINK=ld + LINK=gcc ;; # # Windows-specific configuration diff --git a/login_capture/PAM/linux/Makefile.am b/login_capture/PAM/linux/Makefile.am index def722d9..bb843788 100644 --- a/login_capture/PAM/linux/Makefile.am +++ b/login_capture/PAM/linux/Makefile.am @@ -34,11 +34,7 @@ EXTRA_DIST = *.exp CASAROOT = ../../.. -if cpu_64 -CASALIBDIR = $(CASAROOT)/lib64 -else -CASALIBDIR = $(CASAROOT)/lib -endif +CASALIBDIR = $(CASAROOT)/$(LIB) # handle Mono secondary dependencies export MONO_PATH := $(MONO_PATH) @@ -60,13 +56,10 @@ CFLAGS += $(INCLUDES) $(DEFINES) LIBS = 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 -if cpu_64 -OBJDIR = ./$(TARGET_CFG)/lib64 -else -OBJDIR = ./$(TARGET_CFG)/lib -endif + +OBJDIR = ./$(TARGET_CFG)/$(LIB) OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o)) CUR_DIR := $(shell pwd) diff --git a/package/linux/CASA.spec.in b/package/linux/CASA.spec.in index 7803b035..e89730a5 100644 --- a/package/linux/CASA.spec.in +++ b/package/linux/CASA.spec.in @@ -28,7 +28,7 @@ Version: @VERSION@ Release: 0 Summary: Novell Common Authentication Service Adapter (CASA) Source: %{name}-%{version}.tar.bz2 -#Patch: %{name}-%{version}.dif +Patch: %{name}-%{version}.diff #Patch2: CASA-detect_lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mono >= 1.1.13 mono-core >= 1.1.13 @@ -69,7 +69,7 @@ to one another. %prep %setup -q -#%patch2 +%patch %if %{_lib} == "lib64" %define binsource bin64 %else @@ -169,10 +169,8 @@ install c_gui/CASAManager.desktop %{buildroot}/usr/share/applications %suse_update_desktop_file CASAManager %post -echo " " %{fillup_and_insserv -y micasad} -echo " " -#if [ "x$1" == "x1" ] || [ "x$1" == "x2" ] +#if [ "x$1" = "x1" ] || [ "x$1" = "x2" ] #then # casacfgpam #fi @@ -181,9 +179,10 @@ echo " " %post gui /sbin/ldconfig + %preun %stop_on_removal micasad -if [ "x$1" == "x0" ] +if [ "x$1" = "x0" ] then /usr/sbin/casaucfgpam fi @@ -191,12 +190,12 @@ fi %postun %restart_on_update - %insserv_cleanup /sbin/ldconfig %postun gui /sbin/ldconfig + %clean rm -rf $RPM_BUILD_ROOT