diff --git a/shsrc/lshsrc/CASA_dbg.spec b/shsrc/lshsrc/CASA_dbg.spec
new file mode 100644
index 00000000..11fc981f
--- /dev/null
+++ b/shsrc/lshsrc/CASA_dbg.spec
@@ -0,0 +1,300 @@
+#
+# spec file for package CASA (Version 1.5.0)
+#
+# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Please submit bugfixes or comments via http://www.suse.de/feedback/
+#
+
+# norootforbuild
+# neededforbuild  gnome-filesystem mono gtk2-devel gtk2 gtk-sharp-gapi gtk-sharp glib2 glib2-devel qt3-devel gcc-c++ kdeutils3 kdelibs3-devel kdelibs3 qt3 qt3-devel kdesdk3 libstdc++-devel pkgconfig gnome-keyring gnome-keyring-devel glib-devel glib pam pam-devel java2
+
+Name:         CASA
+URL:          http://www.novell.com/products
+%define prefix /opt/novell
+License:      GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+Group:        Productivity/Other
+Autoreqprov:  on
+%define	      bldno	1.1.1
+Version:      1.5.000
+Release:      0
+Summary:      Novell Common Authentication Service Adapter (CASA)
+Source:       %{name}-%{version}.tar.bz2
+BuildRoot:    %{_tmppath}/%{name}-%{version}-build
+requires:     mono >= 1.1.7
+ExclusiveArch: %ix86 x86_64
+#NoSource:     0
+
+%description
+CASA (Common Authentication Services Adaptor) is a common authentication 
+and security package providing a set of libraries for application and 
+service developers to provide single sign-on to an enterprise network. 
+CASA provides a local on box credential store that is purely session 
+based in 1.0. This store is populated with your Desktop and Network Login 
+credentials on Novell Linux Desktop, Windows and Apple workstations.
+
+%package devel
+Summary:      Include Files and Libraries mandatory for Development.
+Group:        Productivity/Other
+Requires:     CASA >= 1.0.0
+Provides:     CASA-devel
+
+%description devel 
+This package contains all necessary include files and libraries needed
+to develop applications that can use CASA (Common Authnetication Services Adapter) 
+for credential storage and single sign-on.
+
+%package gui
+Summary:      The CASA Console Utility
+Group:        Productivity/Other
+Requires:     CASA = %{version} gtk-sharp >= 1.0.9 gnome-keyring >= 0.2.1 kdelibs3 >= 3.2.1 gtk2 >= 2.4.14
+Provides:     CASA-gui
+
+%description gui 
+This package contains the CASA (Common Authnetication Services Adapter) 
+Management application that allows you to manage credentials within CASA 
+and for your kwallet gnome keyring.  Additionally, you can also link secrets 
+to one another.
+
+%prep
+%setup -q
+
+%ifarch x86_64
+%define binsource bin64
+%else
+%define binsource bin
+%endif
+
+
+%build
+
+export PATH=.:$PATH
+mk-ca-all
+
+%install
+
+mkdir -p %{buildroot}%{prefix}
+mkdir %{buildroot}%{prefix}/CASA
+mkdir %{buildroot}%{prefix}/CASA/%{_lib}
+mkdir %{buildroot}%{prefix}/CASA/bin
+mkdir %{buildroot}%{prefix}/CASA/include
+mkdir %{buildroot}%{prefix}/CASA/images
+mkdir %{buildroot}%{prefix}/CASA/help
+mkdir %{buildroot}%{prefix}/CASA/help/en
+mkdir %{buildroot}%{prefix}/CASA/doc
+mkdir -p %{buildroot}/%{_lib}/security
+
+install -m 755 %{_lib}/lux/dbg/libmicasa.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}
+install -m 755 %{_lib}/lux/dbg/libad_gk.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}
+install -m 755 %{_lib}/lux/dbg/libkwallets_rw.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}
+install -m 755 %{_lib}/lux/dbg/libjmicasa.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}
+install -m 755 %{_lib}/lux/dbg/Novell.CASA.miCASAWrapper.dll %{buildroot}%{prefix}/CASA/%{_lib}
+install -m 755 %{_lib}/lux/dbg/Novell.CASA.Common.dll %{buildroot}%{prefix}/CASA/%{_lib}
+install -m 755 %{_lib}/lux/dbg/Novell.CASA.A-D.dll %{buildroot}%{prefix}/CASA/%{_lib}
+install -m 755 %{_lib}/lux/dbg/Novell.CASA.CASAPolicy.dll %{buildroot}%{prefix}/CASA/%{_lib}
+install -m 755 %{_lib}/lux/dbg/Novell.CASA.DataEngines.GnomeKeyring.dll %{buildroot}%{prefix}/CASA/%{_lib}
+install -m 755 %{_lib}/lux/dbg/Novell.CASA.DataEngines.KWallet.dll %{buildroot}%{prefix}/CASA/%{_lib}
+
+install -m 755 %{binsource}/lux/dbg/micasad.exe %{buildroot}%{prefix}/CASA/bin
+install -m 755 %{binsource}/lux/dbg/CASAManager.exe %{buildroot}%{prefix}/CASA/bin
+install -m 755 c_gui/CASAManager.sh %{buildroot}%{prefix}/CASA/bin
+install -m 755 c_gui/CASAManager.desktop %{buildroot}%{prefix}/CASA/
+cp -f c_gui/images/* %{buildroot}%{prefix}/CASA/images
+cp -f c_gui/help/en/* %{buildroot}%{prefix}/CASA/help/en
+install -m 755 c_micasad/startup/micasad %{buildroot}%{prefix}/CASA/bin
+install -m 755 c_micasad/startup/micasad.sh %{buildroot}%{prefix}/CASA/bin
+#install -m 755 c_clientlogin/novell-ncl-autologin.sh %{buildroot}%{prefix}/CASA/bin
+
+install -m 755 %{_lib}/lux/dbg/pam_micasa.so %{buildroot}/%{_lib}/security
+
+install -d %{buildroot}%{prefix}/%{_lib}
+install -d %{buildroot}%{prefix}/bin
+install -d %{buildroot}%{prefix}/include
+install -d %{buildroot}%{prefix}/CASA/%{_lib}
+install -d %{buildroot}%{prefix}/CASA/bin
+install -d %{buildroot}%{prefix}/CASA/doc
+install -d %{buildroot}%{prefix}/CASA/include
+install -d %{buildroot}%{prefix}/CASA/images
+install -d %{buildroot}%{prefix}/CASA/help/en
+install -d %{buildroot}/%{_lib}/security
+
+
+#install -m 644 %{buildroot}%{prefix}/%{_lib}/miCASA.jar %{buildroot}%{prefix}/CASA/%{_lib}
+
+install -m 644 doc/CASA_Reference_Guide.pdf %{buildroot}%{prefix}/CASA/doc
+install -m 644 doc/License.txt %{buildroot}%{prefix}/CASA/doc
+install -m 644 doc/Readme.txt %{buildroot}%{prefix}/CASA/doc
+install -m 644 include/micasa_mgmd.h %{buildroot}%{prefix}/CASA/include
+install -m 644 include/* %{buildroot}%{prefix}/CASA/include
+
+
+#cp -f include/micasa.h %{buildroot}%{prefix}/CASA/include/
+#cp -f include/micasa_mgmd.h %{buildroot}%{prefix}/CASA/include/
+#cp -f doc/CASA_Reference_Guide.pdf %{buildroot}%{prefix}/CASA/doc/
+#cp -f doc/Readme.txt %{buildroot}%{prefix}/CASA/doc/
+#cp -f doc/License.txt %{buildroot}%{prefix}/CASA/doc/
+
+
+ln -s ../CASA/bin/micasad.exe %{buildroot}%{prefix}/bin/micasad.exe
+ln -s ../CASA/bin/micasad.sh %{buildroot}%{prefix}/bin/micasad.sh
+ln -s ../CASA/bin/micasad %{buildroot}%{prefix}/bin/micasad
+ln -s ../CASA/bin/CASAManager.exe %{buildroot}%{prefix}/bin/CASAManager.exe
+ln -s ../CASA/bin/CASAManager.sh %{buildroot}%{prefix}/bin/CASAManager.sh
+
+ln -s libmicasa.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}/libmicasa.so
+ln -s libmicasa.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}/libmicasa.so.1
+ln -s libjmicasa.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}/libjmicasa.so
+ln -s libjmicasa.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}/libjmicasa.so.1
+#ln -s miCASA.jar %{buildroot}%{prefix}/CASA/%{_lib}/jmiCASA.jar
+
+ln -s ../CASA/%{_lib}/libmicasa.so %{buildroot}%{prefix}/%{_lib}/libmicasa.so
+ln -s ../CASA/%{_lib}/libmicasa.so.1 %{buildroot}%{prefix}/%{_lib}/libmicasa.so.1
+ln -s ../CASA/%{_lib}/libjmicasa.so %{buildroot}%{prefix}/%{_lib}/libjmicasa.so
+ln -s ../CASA/%{_lib}/libjmicasa.so.1 %{buildroot}%{prefix}/%{_lib}/libjmicasa.so.1
+#ln -s ../CASA/%{_lib}/miCASA.jar %{buildroot}%{prefix}/%{_lib}/jmiCASA.jar
+ln -s ../CASA/%{_lib}/Novell.CASA.miCASAWrapper.dll %{buildroot}%{prefix}/%{_lib}/Novell.CASA.miCASAWrapper.dll
+ln -s ../CASA/%{_lib}/Novell.CASA.Common.dll %{buildroot}%{prefix}/%{_lib}/Novell.CASA.Common.dll
+ln -s ../CASA/%{_lib}/Novell.CASA.CASAPolicy.dll %{buildroot}%{prefix}/%{_lib}/Novell.CASA.CASAPolicy.dll
+ln -s ../CASA/%{_lib}/Novell.CASA.A-D.dll %{buildroot}%{prefix}/%{_lib}/Novell.CASA.A-D.dll
+ln -s ../CASA/%{_lib}/Novell.CASA.DataEngines.GnomeKeyring.dll %{buildroot}%{prefix}/%{_lib}/Novell.CASA.DataEngines.GnomeKeyring.dll
+ln -s ../CASA/%{_lib}/Novell.CASA.DataEngines.KWallet.dll %{buildroot}%{prefix}/%{_lib}/Novell.CASA.DataEngines.KWallet.dll
+
+ln -s libkwallets_rw.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}/libkwallets_rw.so
+ln -s libkwallets_rw.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}/libkwallets_rw.so.1
+
+ln -s ../CASA/%{_lib}/libkwallets_rw.so %{buildroot}%{prefix}/%{_lib}/libkwallets_rw.so
+ln -s ../CASA/%{_lib}/libkwallets_rw.so.1 %{buildroot}%{prefix}/%{_lib}/libkwallets_rw.so.1
+ln -s libad_gk.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}/libad_gk.so
+ln -s libad_gk.so.%{bldno} %{buildroot}%{prefix}/CASA/%{_lib}/libad_gk.so.1
+
+ln -s ../CASA/%{_lib}/libad_gk.so %{buildroot}%{prefix}/%{_lib}/libad_gk.so
+ln -s ../CASA/%{_lib}/libad_gk.so.1 %{buildroot}%{prefix}/%{_lib}/libad_gk.so.1
+
+ln -s ../CASA/include/micasa.h %{buildroot}%{prefix}/include/micasa.h
+ln -s ../CASA/include/micasa_mgmd.h %{buildroot}%{prefix}/include/micasa_mgmd.h
+
+# autologin 
+#mkdir -p %{buildroot}/etc/profile.d
+#cp %{buildroot}%{prefix}/CASA/bin/novell-ncl-autologin.sh %{buildroot}/etc/profile.d
+
+mkdir -p %{buildroot}/etc/init.d
+mkdir -p %{buildroot}/etc/ld.so.conf.d
+cp %{buildroot}%{prefix}/CASA/bin/micasad %{buildroot}/etc/init.d
+echo "/opt/novell/CASA/%{_lib}/" >> %{buildroot}/etc/ld.so.conf.d/CASA.conf
+
+
+%post
+if [ $1 -eq 1 ]
+then
+        insserv /etc/init.d/micasad	
+fi
+/sbin/ldconfig
+
+%preun
+
+
+%stop_on_removal micasad
+
+%postun
+%restart_on_update micasad
+%insserv_cleanup
+/sbin/ldconfig
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%dir %{prefix}
+%dir %{prefix}/CASA
+%dir %{prefix}/%{_lib}
+%dir %{prefix}/CASA/%{_lib}
+%dir %{prefix}/CASA/doc
+%dir %{prefix}/CASA/%{_lib}/libmicasa.so.%{bldno}
+%dir %{prefix}/CASA/%{_lib}/libmicasa.so
+%dir %{prefix}/CASA/%{_lib}/libmicasa.so.1
+%dir %{prefix}/CASA/%{_lib}/libjmicasa.so.%{bldno}
+%dir %{prefix}/CASA/%{_lib}/libjmicasa.so
+%dir %{prefix}/CASA/%{_lib}/libjmicasa.so.1
+%dir %{prefix}/CASA/%{_lib}/Novell.CASA.miCASAWrapper.dll
+%dir %{prefix}/CASA/%{_lib}/Novell.CASA.Common.dll
+
+%dir %{prefix}/%{_lib}/libmicasa.so
+%dir %{prefix}/%{_lib}/libmicasa.so.1
+%dir %{prefix}/%{_lib}/libjmicasa.so
+%dir %{prefix}/%{_lib}/libjmicasa.so.1
+
+%dir %{prefix}/%{_lib}/Novell.CASA.miCASAWrapper.dll
+%dir %{prefix}/%{_lib}/Novell.CASA.Common.dll
+
+%dir %{prefix}/bin
+%dir %{prefix}/CASA/bin
+%{prefix}/CASA/bin/micasad
+%{prefix}/CASA/bin/micasad.sh
+%{prefix}/CASA/bin/micasad.exe
+
+%{prefix}/CASA/doc/CASA_Reference_Guide.pdf
+%{prefix}/CASA/doc/License.txt
+%{prefix}/CASA/doc/Readme.txt
+
+%{prefix}/bin/micasad
+%{prefix}/bin/micasad.sh
+%{prefix}/bin/micasad.exe
+
+#%dir %{prefix}/CASA/doc
+
+/etc/init.d/micasad
+/%{_lib}/security/pam_micasa.so
+/etc/ld.so.conf.d/CASA.conf
+
+%files devel 
+%defattr(-,root,root)
+%{prefix}/include
+%{prefix}/CASA/include
+%{prefix}/CASA/%{_lib}/*.so
+%{prefix}/CASA/doc/CASA_Reference_Guide.pdf
+%{prefix}/CASA/doc/License.txt
+%{prefix}/CASA/doc/Readme.txt
+
+
+%files gui
+%defattr(-,root,root)
+%dir %{prefix}/CASA/bin/
+%{prefix}/CASA/bin/CASAManager.sh
+%{prefix}/CASA/bin/CASAManager.exe
+%{prefix}/CASA/CASAManager.desktop
+%{prefix}/CASA/doc/License.txt
+%{prefix}/CASA/doc/Readme.txt
+
+
+%dir %{prefix}/CASA/%{_lib}/
+
+%{prefix}/CASA/%{_lib}/libad_gk.so.%{bldno}
+%{prefix}/CASA/%{_lib}/libad_gk.so
+%{prefix}/CASA/%{_lib}/libad_gk.so.1
+%{prefix}/CASA/%{_lib}/libkwallets_rw.so.%{bldno}
+%{prefix}/CASA/%{_lib}/libkwallets_rw.so
+%{prefix}/CASA/%{_lib}/libkwallets_rw.so.1
+%{prefix}/CASA/%{_lib}/Novell.CASA.A-D.dll
+%{prefix}/CASA/%{_lib}/Novell.CASA.CASAPolicy.dll
+%{prefix}/CASA/%{_lib}/Novell.CASA.DataEngines.GnomeKeyring.dll
+%{prefix}/CASA/%{_lib}/Novell.CASA.DataEngines.KWallet.dll
+
+%{prefix}/%{_lib}/libad_gk.so
+%{prefix}/%{_lib}/libad_gk.so.1
+%{prefix}/%{_lib}/libkwallets_rw.so
+%{prefix}/%{_lib}/libkwallets_rw.so.1
+%{prefix}/%{_lib}/Novell.CASA.A-D.dll
+%{prefix}/%{_lib}/Novell.CASA.CASAPolicy.dll
+%{prefix}/%{_lib}/Novell.CASA.DataEngines.GnomeKeyring.dll
+%{prefix}/%{_lib}/Novell.CASA.DataEngines.KWallet.dll
+
+%dir %{prefix}/CASA/images
+%dir %{prefix}/CASA/images/*
+
+%dir %{prefix}/CASA/help/en
+%dir %{prefix}/CASA/help/en/*
+
+%changelog -n CASA
diff --git a/shsrc/lshsrc/mk-ca-all b/shsrc/lshsrc/mk-ca-all
index 68875b74..4c960d8e 100644
--- a/shsrc/lshsrc/mk-ca-all
+++ b/shsrc/lshsrc/mk-ca-all
@@ -5,14 +5,6 @@ rm -rf ../../bin64 ../../bin ../../lib64 ../../lib ../../obj64 ../../obj
 
 echo
 
-
-if (mk-micasacache-ol d clean all)
-then
-echo
-else
-echo '**** BUILDING OPTIMIZED libmicasacache.a FAILED ****'
-exit 1
-fi
 if(mk-micasacache-dl d clean all)
 then
 echo
@@ -21,14 +13,6 @@ echo '**** BUILDING DEBUG libmicasacache.a FAILED ****'
 exit 1
 fi
 
-
-if (mk-micasadk-ol d clean all)
-then
-echo
-else
-echo '**** BUILDING OPTIMIZED libmicasa.so FAILED ****'
-exit 1
-fi
 if(mk-micasadk-dl d clean all)
 then
 echo
@@ -45,14 +29,6 @@ echo '**** BUILDING DEBUG CSharp Common FAILED ****'
 exit 1
 fi
 
-if (mk-micasacommon-ol d clean all)
-then
-echo
-else
-echo '**** BUILDING OPTIMIZED CSharp Common FAILED ****'
-exit 1
-fi
-
 if (mk-micasawrap-dl d clean all)
 then
 echo
@@ -61,14 +37,6 @@ echo '**** BUILDING DEBUG CSharp Wrapper FAILED ****'
 exit 1
 fi
 
-if (mk-micasawrap-ol d clean all)
-then
-echo
-else
-echo '**** BUILDING CSharp Wrapper FAILED ****'
-exit 1
-fi
-
 if (mk-micasad-dl d clean all)
 then
 echo
@@ -77,14 +45,6 @@ echo '**** BUILDING DEBUG miCASA DAEMON FAILED ****'
 exit 1
 fi
 
-if (mk-micasad-ol d clean all)
-then
-echo
-else
-echo '**** BUILDING NON-DEBUG miCASA DAEMON FAILED ****'
-exit 1
-fi
-
 if (mk-micasapol-dl d clean all)
 then
 echo
@@ -93,15 +53,6 @@ echo '**** BUILDING DEBUG Policy Lib FAILED ****'
 exit 1
 fi
 
-if (mk-micasapol-ol d clean all)
-then
-echo
-else
-echo '**** BUILDING NON-DEBUG Policy Lib FAILED ****'
-exit 1
-fi
-
-
 if (mk-micasa_kw-dl d clean all)
 then
 echo
@@ -110,14 +61,6 @@ echo '**** BUILDING DEBUG KWallet Native Lib FAILED ****'
 exit 1
 fi
 
-if (mk-micasa_kw-ol d clean all)
-then
-echo
-else
-echo '**** BUILDING NON-DEBUG KWallet Native Lib FAILED ****'
-exit 1
-fi
-
 if (mk-micasa_kwwrap-dl d clean all)
 then
 echo
@@ -126,14 +69,6 @@ echo '**** BUILDING DEBUG KWallet Wrapper Dll FAILED ****'
 exit 1
 fi
 
-if (mk-micasa_kwwrap-ol d clean all)
-then
-echo
-else
-echo '**** BUILDING NON-DEBUG KWallet Wrapper Dll FAILED ****'
-exit 1
-fi
-
 if (mk-micasa_gk-dl d clean all)
 then
 echo
@@ -142,14 +77,6 @@ echo '**** BUILDING DEBUG Gnome Keyring Native Lib FAILED ****'
 exit 1
 fi
 
-if (mk-micasa_gk-ol d clean all)
-then
-echo
-else
-echo '**** BUILDING NON-DEBUG Gnome Keyring Native Lib FAILED ****'
-exit 1
-fi
-
 if (mk-micasa_gkwrap-dl d clean all)
 then
 echo
@@ -158,15 +85,6 @@ echo '**** BUILDING DEBUG Gnome Keyring Wrapper Dll FAILED ****'
 exit 1
 fi
 
-if (mk-micasa_gkwrap-ol d clean all)
-then
-echo
-else
-echo '**** BUILDING NON-DEBUG Gnome Keyring Wrapper Dll FAILED ****'
-exit 1
-fi
-
-
 if (mk-micasa_ad-dl d clean all)
 then
 echo
@@ -175,15 +93,6 @@ echo '**** BUILDING DEBUG AD Lib FAILED ****'
 exit 1
 fi
 
-if (mk-micasa_ad-ol d clean all)
-then
-echo
-else
-echo '**** BUILDING NON-DEBUG AD Lib FAILED ****'
-exit 1
-fi
-
-
 if (mk-micasaconsole-dl d clean all)
 then
 echo
@@ -192,14 +101,6 @@ echo '**** BUILDING DEBUG CASA Console FAILED ****'
 exit 1
 fi
 
-if (mk-micasaconsole-ol d clean all)
-then
-echo
-else
-echo '**** BUILDING NON-DEBUG CASA Console FAILED ****'
-exit 1
-fi
-
 if (mk-loginpam-dl d clean all)
 then
 echo
@@ -208,14 +109,6 @@ echo '**** BUILDING DEBUG Login Capture PAM module FAILED ****'
 exit 1
 fi
 
-if (./mk-loginpam-ol d clean all)
-then
-echo
-else
-echo '**** BUILDING NON-DEBUG Login Capture PAM module FAILED ****'
-exit 1
-fi
-
 if (./mk-jmicasa-dl d clean all)
 then
 echo
@@ -224,28 +117,11 @@ echo '**** BUILDING DEBUG jmicasa FAILED ****'
 exit 1
 fi
 
-if (./mk-jmicasa-ol d clean all)
-then
-echo
-else
-echo '**** BUILDING NON-DEBUG jmicasa FAILED ****'
-exit 1
-fi
-
-if (mk-clientlogin-dl d clean all)
-then
-echo
-else
-echo '**** BUILDING debug client login FAILED ****'
-exit 1
-fi
-
-if (mk-clientlogin-ol d clean all)
-then
-echo
-else
-echo '**** BUILDING client login FAILED ****'
-exit 1
-fi
-
+#if (mk-clientlogin-dl d clean all)
+#then
+#echo
+#else
+#echo '**** BUILDING debug client login FAILED ****'
+#exit 1
+#fi
 
diff --git a/shsrc/lshsrc/mk-cai-all b/shsrc/lshsrc/mk-cai-all
index 91e3876e..8eb5b913 100644
--- a/shsrc/lshsrc/mk-cai-all
+++ b/shsrc/lshsrc/mk-cai-all
@@ -9,7 +9,7 @@ if (mk-micasacache-ol m clean all )
 then
 echo
 else
-echo '**** BUILDING OPTIMIZED libmicasacache.a FAILED ****'
+echo '**** BUILDING libmicasacache.a FAILED ****'
 exit 1
 fi
 
@@ -17,7 +17,7 @@ if (mk-micasadk-ol m clean all )
 then
 echo
 else
-echo '**** BUILDING OPTIMIZED libmicasa.so FAILED ****'
+echo '**** BUILDING libmicasa.so FAILED ****'
 exit 1
 fi
 
@@ -25,7 +25,7 @@ if (mk-micasacommon-ol m clean all )
 then
 echo
 else
-echo '**** BUILDING OPTIMIZED CSharp Common FAILED ****'
+echo '**** BUILDING CSharp Common FAILED ****'
 exit 1
 fi
 
@@ -41,7 +41,7 @@ if (mk-micasad-ol m clean all )
 then
 echo
 else
-echo '**** BUILDING NON-DEBUG miCASA DAEMON FAILED ****'
+echo '**** BUILDING miCASA DAEMON FAILED ****'
 exit 1
 fi
 
@@ -49,7 +49,7 @@ if (mk-micasapol-ol m clean all )
 then
 echo
 else
-echo '**** BUILDING NON-DEBUG Policy Lib FAILED ****'
+echo '**** BUILDING Policy Lib FAILED ****'
 exit 1
 fi
 
@@ -57,7 +57,7 @@ if (mk-micasa_kw-ol m clean all )
 then
 echo
 else
-echo '**** BUILDING NON-DEBUG KWallet Native Lib FAILED ****'
+echo '**** BUILDING KWallet Native Lib FAILED ****'
 exit 1
 fi
 
@@ -65,7 +65,7 @@ if (mk-micasa_kwwrap-ol m clean all )
 then
 echo
 else
-echo '**** BUILDING NON-DEBUG KWallet Wrapper Dll FAILED ****'
+echo '**** BUILDING KWallet Wrapper Dll FAILED ****'
 exit 1
 fi
 
@@ -73,7 +73,7 @@ if (mk-micasa_gk-ol m clean all )
 then
 echo
 else
-echo '**** BUILDING NON-DEBUG Gnome Keyring Native Lib FAILED ****'
+echo '**** BUILDING Gnome Keyring Native Lib FAILED ****'
 exit 1
 fi
 
@@ -81,7 +81,7 @@ if (mk-micasa_gkwrap-ol m clean all )
 then
 echo
 else
-echo '**** BUILDING NON-DEBUG Gnome Keyring Wrapper Dll FAILED ****'
+echo '**** BUILDING Gnome Keyring Wrapper Dll FAILED ****'
 exit 1
 fi
 
@@ -89,7 +89,7 @@ if (mk-micasa_ad-ol m clean all )
 then
 echo
 else
-echo '**** BUILDING NON-DEBUG AD Lib FAILED ****'
+echo '**** BUILDING AD Lib FAILED ****'
 exit 1
 fi
 
@@ -97,7 +97,7 @@ if (mk-micasaconsole-ol m clean all )
 then
 echo
 else
-echo '**** BUILDING NON-DEBUG CASA Console FAILED ****'
+echo '**** BUILDING CASA Console FAILED ****'
 exit 1
 fi
 
@@ -105,7 +105,7 @@ if (mk-loginpam-ol m clean all )
 then
 echo
 else
-echo '**** BUILDING NON-DEBUG LOGIN PAM FAILED ****'
+echo '**** BUILDING LOGIN PAM FAILED ****'
 exit 1
 fi
 
@@ -113,35 +113,10 @@ if (mk-jmicasa-ol m clean all )
 then
 echo
 else
-echo '**** BUILDING NON-DEBUG jmicasa FAILED ****'
+echo '**** BUILDING jmicasa FAILED ****'
 exit 1
 fi
 
-#if (mk-casa-tarpkg)
-#then
-#echo
-#else
-#echo '**** BUILDING CASA TAR BALL FAILED ****'
-#exit 1
-#fi
-
-
-#if (mk-casa-rpmpkg)
-#then
-#echo
-#else
-#echo '**** BUILDING CASA RPM FAILED ****'
-#exit 1
-#fi
-
-
-#if (mk-micasa-rpmpkg)
-#then
-#echo
-#else
-#echo '**** BUILDING miCASA RPM FAILED ****'
-#exit 1
-#fi
 
 #if (mk-clientlogin-ol m clean all)
 #then