dl9pf@glorfindel:~/svn/simias/trunk/test> cat /home/dl9pf/simias-make-dist-fixes_6801_jsm_lan_posix.diff
Index: configure.in
===================================================================
--- configure.in        (revision 6801)
+++ configure.in        (working copy)
@@ -1,6 +1,7 @@
-AC_INIT(src/core/Common/Configuration.cs)
+AC_INIT(simias, 1.5)
+AC_CONFIG_SRCDIR(src/core/Common/Configuration.cs)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(simias, 1.5)
+AM_INIT_AUTOMAKE([tar-ustar])
 # Check to see if the BUILDNUM is set by global build
 if test "$BUILDNUM" = ""; then
        let "BUILDNUM=`date +%G%j`-2000000"
@@ -501,10 +502,10 @@
        case $SIMIAS_OS in
                windows)
                        simiasdatadir=`cygpath --mixed "$USERPROFILE/Local Settings/Application Data/simias"`
-                       simiaslogdir="${simiasdatadir}" ;;
+                       simiaslogdir="\$APPDATA/simias" ;;
                linux)
                        simiasdatadir="$HOME/.local/share/simias"
-                       simiaslogdir="${simiasdatadir}" ;;
+                       simiaslogdir="\${HOME}/.local/share/simias" ;;
                darwin)
                        simiasdatadir="$HOME/.local/share/simias"
                        simiaslogdir="${simiasdatadir}" ;;
Index: src/webaccess/Makefile.am
===================================================================
--- src/webaccess/Makefile.am   (revision 6801)
+++ src/webaccess/Makefile.am   (working copy)
@@ -1,166 +1,168 @@
-# handle Mono secondary dependencies
-export MONO_PATH := $(MONO_PATH)
-
-iFolderWeb_CSFILES = \
-       $(srcdir)/AssemblyInfo.cs \
-       $(srcdir)/Default.aspx.cs \
-       $(srcdir)/Download.ashx.cs \
-       $(srcdir)/Browse.aspx.cs \
-       $(srcdir)/Search.aspx.cs \
-       $(srcdir)/NewFolder.aspx.cs \
-       $(srcdir)/Upload.aspx.cs \
-       $(srcdir)/ItemHistory.aspx.cs \
-       $(srcdir)/Error.aspx.cs \
-       $(srcdir)/Quota.ascx.cs \
-       $(srcdir)/Global.asax.cs \
-       $(srcdir)/Header.ascx.cs \
-       $(srcdir)/Details.aspx.cs \
-       $(srcdir)/History.aspx.cs \
-       $(srcdir)/Members.aspx.cs \
-       $(srcdir)/iFolders.aspx.cs \
-       $(srcdir)/iFolderWebProxy.cs \
-       $(srcdir)/Login.aspx.cs \
-       $(srcdir)/Message.ascx.cs \
-       $(srcdir)/Pagging.ascx.cs \
-       $(srcdir)/HomeContext.ascx.cs \
-       $(srcdir)/iFolderActions.ascx.cs \
-       $(srcdir)/iFolderContext.ascx.cs \
-       $(srcdir)/TabControl.ascx.cs \
-       $(srcdir)/Share.aspx.cs \
-       $(srcdir)/iFolderNew.aspx.cs \
-       $(srcdir)/iFolderEdit.aspx.cs \
-       $(srcdir)/Settings.aspx.cs \
-       $(srcdir)/UploadModule.cs \
-       $(srcdir)/UploadStream.cs \
-       $(srcdir)/WebLogger.cs \
-       $(srcdir)/iFolderCertificate.aspx.cs \
-       $(srcdir)/WebSettings.cs \
-       $(srcdir)/WebUtility.cs
-#      $(srcdir)/../core/Encryption/Blowfish.cs
-
-
-iFolderWeb_CSFILES_CSC := $(subst /,$(SEP),$(iFolderWeb_CSFILES))
-
-iFolderWeb_INCLUDES =
-
-iFolderWeb_RESX = \
-       $(srcdir)/iFolderWeb.resx \
-       $(shell ls $(srcdir)/iFolderWeb.*.resx)
-
-iFolderWeb_RESOURCES := $(iFolderWeb_RESX:$(srcdir)/%.resx=$(srcdir)/Novell.iFolderApp.Web.%.resources)
-
-iFolderWeb_FLAGS = $(CSC_LIBFLAG)
-
-iFolderWeb_LIBS = \
-       System.dll \
-       System.Data.dll \
-       $(SYSTEM_XML) \
-       System.Drawing.dll \
-       System.Web.dll \
-       System.Web.Services.dll \
-       $(srcdir)/../core/SimiasLib.dll/SimiasLib.dll
-#if !LINUX
-#      iFolderWeb_LIBS := $(iFolderWeb_LIBS) log4net.dll
-#endif
-
-iFolderWeb_LIBPATH = $(LOG4NET_DIR)
-
-iFolderWeb_FORMS = \
-       Global.asax \
-       Default.aspx \
-       Browse.aspx \
-       Search.aspx \
-       NewFolder.aspx \
-       Upload.aspx \
-       ItemHistory.aspx \
-       Error.aspx \
-       Details.aspx \
-       History.aspx \
-       Members.aspx \
-       iFolders.aspx \
-       Login.aspx \
-       iFolderNew.aspx \
-       iFolderEdit.aspx \
-       Share.aspx \
-       Settings.aspx \
-       iFolderCertificate.aspx \
-       Quota.ascx \
-       Header.ascx \
-       Message.ascx \
-       Pagging.ascx \
-       HomeContext.ascx \
-       iFolderContext.ascx \
-       iFolderActions.ascx \
-       TabControl.ascx \
-       Download.ashx \
-       Log4Net.config \
-       Web.config
-
-EXTRA_DIST = AssemblyInfo.cs.in Log4Net.config.in $(iFolderWeb_CSFILES) $(iFolderWeb_FORMS) images css js help $(iFolderWeb_RESX)
-
-dist-hook:
-       rm -rf `find $(distdir)/images -name .svn`
-       rm -rf `find $(distdir)/css -name .svn`
-       rm -rf `find $(distdir)/js -name .svn`
-       rm -rf `find $(distdir)/help -name .svn`
-
-if DEBUG
-if WINDOWS
-DEBUG_FILES = Novell.iFolderWeb.pdb
-endif
-endif
-
-CLEAN_FILES = Novell.iFolderWeb.dll \
-       Novell.iFolderWeb.doc.xml \
-       $(iFolderWeb_RESOURCES) \
-       $(srcdir)/iFolderWebProxy.cs \
-       $(DEBUG_FILES)
-
-all: Novell.iFolderWeb.dll
-
-iFolderWebProxy.cs: ../webservices/iFolderWeb.wsdl
-       wsdl /nologo /out:$@ $<
-
-Novell.iFolderWeb.dll: $(iFolderWeb_CSFILES) $(iFolderWeb_RESOURCES)
-       $(CSC) /out:$@ $(CSCFLAGS) $(iFolderWeb_FLAGS) $(iFolderWeb_LIBS:%=/r:%) $(iFolderWeb_RESOURCES:%=/res:%) $(iFolderWeb_LIBPATH:%=/lib:%) $(LOG4NET_LIBS) $(iFolderWeb_CSFILES_CSC) /doc:iFolderWeb.doc.xml
-
-Novell.iFolderApp.Web.%.resources : %.resx
-       $(RESGEN) $< $@
-
-install-exec-local: all
-       rm -rf $(DESTDIR)$(webaccessdir)
-       $(mkinstalldirs) $(DESTDIR)$(webaccessdir)
-       $(mkinstalldirs) $(DESTDIR)$(webaccessdir)/bin
-       $(mkinstalldirs) $(DESTDIR)$(webaccessdir)/images
-       $(mkinstalldirs) $(DESTDIR)$(webaccessdir)/help
-       $(mkinstalldirs) $(DESTDIR)$(webaccessdir)/css
-       $(mkinstalldirs) $(DESTDIR)$(webaccessdir)/js
-       $(INSTALL_PROGRAM) $(iFolderWeb_FORMS) $(DESTDIR)$(webaccessdir)
-       $(INSTALL_PROGRAM) Novell.iFolderWeb.dll $(DEBUG_FILES) $(DESTDIR)$(webaccessdir)/bin
-       $(INSTALL_PROGRAM) $(srcdir)/css/*.css $(DESTDIR)$(webaccessdir)/css
-       $(INSTALL_PROGRAM) $(srcdir)/js/*.js $(DESTDIR)$(webaccessdir)/js
-       cd $(srcdir)/help; cp -r * $(DESTDIR)$(webaccessdir)/help
-       rm -rf `find $(DESTDIR)$(webaccessdir)/help -name .svn`
-       cd $(srcdir)/images; cp -r * $(DESTDIR)$(webaccessdir)/images
-       rm -rf `find $(DESTDIR)$(webaccessdir)/images -name .svn`
-       $(INSTALL_PROGRAM) $(DESTDIR)$(webaccessdir)/../web/bin/SimiasLib.dll $(DESTDIR)$(webaccessdir)/bin
-#if !LINUX
-#      $(INSTALL_PROGRAM) $(LOG4NET_DIR)/log4net.dll $(DESTDIR)$(webaccessdir)/bin
-#endif
-
-uninstall-local:
-       rm -rf $(DESTDIR)$(webaccessdir)
-
-installcheck-local: install
-
-clean-local:
-       rm -rf $(CLEAN_FILES) $(COMMON_CLEAN_FILES)
-
-distclean-local:
-       rm -rf $(COMMON_DISTCLEAN_FILES)
-
-maintainer-clean-local:
-       rm -rf $(COMMON_MAINTAINER_CLEAN_FILES)
-       rm -rf AssemblyInfo.cs
-       rm -rf Log4Net.config
-
+# handle Mono secondary dependencies
+export MONO_PATH := $(MONO_PATH)
+
+iFolderWeb_CSFILES = \
+       $(srcdir)/AssemblyInfo.cs \
+       $(srcdir)/Default.aspx.cs \
+       $(srcdir)/Download.ashx.cs \
+       $(srcdir)/Browse.aspx.cs \
+       $(srcdir)/Search.aspx.cs \
+       $(srcdir)/NewFolder.aspx.cs \
+       $(srcdir)/Upload.aspx.cs \
+       $(srcdir)/ItemHistory.aspx.cs \
+       $(srcdir)/Error.aspx.cs \
+       $(srcdir)/Quota.ascx.cs \
+       $(srcdir)/Global.asax.cs \
+       $(srcdir)/Header.ascx.cs \
+       $(srcdir)/Details.aspx.cs \
+       $(srcdir)/History.aspx.cs \
+       $(srcdir)/Members.aspx.cs \
+       $(srcdir)/iFolders.aspx.cs \
+       $(srcdir)/Login.aspx.cs \
+       $(srcdir)/Message.ascx.cs \
+       $(srcdir)/Pagging.ascx.cs \
+       $(srcdir)/HomeContext.ascx.cs \
+       $(srcdir)/iFolderActions.ascx.cs \
+       $(srcdir)/iFolderContext.ascx.cs \
+       $(srcdir)/TabControl.ascx.cs \
+       $(srcdir)/Share.aspx.cs \
+       $(srcdir)/iFolderNew.aspx.cs \
+       $(srcdir)/iFolderEdit.aspx.cs \
+       $(srcdir)/Settings.aspx.cs \
+       $(srcdir)/UploadModule.cs \
+       $(srcdir)/UploadStream.cs \
+       $(srcdir)/WebLogger.cs \
+       $(srcdir)/iFolderCertificate.aspx.cs \
+       $(srcdir)/WebSettings.cs \
+       $(srcdir)/WebUtility.cs
+#      $(srcdir)/../core/Encryption/Blowfish.cs
+
+if !SIMIAS_AS_CLIENT
+iFolderWeb_CSFILES += $(srcdir)/iFolderWebProxy.cs
+endif
+
+iFolderWeb_CSFILES_CSC := $(subst /,$(SEP),$(iFolderWeb_CSFILES))
+
+iFolderWeb_INCLUDES =
+
+iFolderWeb_RESX = \
+       $(srcdir)/iFolderWeb.resx \
+       $(shell ls $(srcdir)/iFolderWeb.*.resx)
+
+iFolderWeb_RESOURCES := $(iFolderWeb_RESX:$(srcdir)/%.resx=$(srcdir)/Novell.iFolderApp.Web.%.resources)
+
+iFolderWeb_FLAGS = $(CSC_LIBFLAG)
+
+iFolderWeb_LIBS = \
+       System.dll \
+       System.Data.dll \
+       $(SYSTEM_XML) \
+       System.Drawing.dll \
+       System.Web.dll \
+       System.Web.Services.dll \
+       $(srcdir)/../core/SimiasLib.dll/SimiasLib.dll
+#if !LINUX
+#      iFolderWeb_LIBS := $(iFolderWeb_LIBS) log4net.dll
+#endif
+
+iFolderWeb_LIBPATH = $(LOG4NET_DIR)
+
+iFolderWeb_FORMS = \
+       Global.asax \
+       Default.aspx \
+       Browse.aspx \
+       Search.aspx \
+       NewFolder.aspx \
+       Upload.aspx \
+       ItemHistory.aspx \
+       Error.aspx \
+       Details.aspx \
+       History.aspx \
+       Members.aspx \
+       iFolders.aspx \
+       Login.aspx \
+       iFolderNew.aspx \
+       iFolderEdit.aspx \
+       Share.aspx \
+       Settings.aspx \
+       iFolderCertificate.aspx \
+       Quota.ascx \
+       Header.ascx \
+       Message.ascx \
+       Pagging.ascx \
+       HomeContext.ascx \
+       iFolderContext.ascx \
+       iFolderActions.ascx \
+       TabControl.ascx \
+       Download.ashx \
+       Log4Net.config \
+       Web.config
+
+EXTRA_DIST = AssemblyInfo.cs.in Log4Net.config.in $(iFolderWeb_CSFILES) $(iFolderWeb_FORMS) images css js help $(iFolderWeb_RESX)
+
+dist-hook:
+       rm -rf `find $(distdir)/images -name .svn`
+       rm -rf `find $(distdir)/css -name .svn`
+       rm -rf `find $(distdir)/js -name .svn`
+       rm -rf `find $(distdir)/help -name .svn`
+
+if DEBUG
+if WINDOWS
+DEBUG_FILES = Novell.iFolderWeb.pdb
+endif
+endif
+
+CLEAN_FILES = Novell.iFolderWeb.dll \
+       Novell.iFolderWeb.doc.xml \
+       $(iFolderWeb_RESOURCES) \
+       $(srcdir)/iFolderWebProxy.cs \
+       $(DEBUG_FILES)
+
+all: Novell.iFolderWeb.dll
+
+iFolderWebProxy.cs: ../webservices/iFolderWeb.wsdl
+       wsdl /nologo /out:$@ $<
+
+Novell.iFolderWeb.dll: $(iFolderWeb_CSFILES) $(iFolderWeb_RESOURCES)
+       $(CSC) /out:$@ $(CSCFLAGS) $(iFolderWeb_FLAGS) $(iFolderWeb_LIBS:%=/r:%) $(iFolderWeb_RESOURCES:%=/res:%) $(iFolderWeb_LIBPATH:%=/lib:%) $(LOG4NET_LIBS) $(iFolderWeb_CSFILES_CSC) /doc:iFolderWeb.doc.xml
+
+Novell.iFolderApp.Web.%.resources : %.resx
+       $(RESGEN) $< $@
+
+install-exec-local: all
+       rm -rf $(DESTDIR)$(webaccessdir)
+       $(mkinstalldirs) $(DESTDIR)$(webaccessdir)
+       $(mkinstalldirs) $(DESTDIR)$(webaccessdir)/bin
+       $(mkinstalldirs) $(DESTDIR)$(webaccessdir)/images
+       $(mkinstalldirs) $(DESTDIR)$(webaccessdir)/help
+       $(mkinstalldirs) $(DESTDIR)$(webaccessdir)/css
+       $(mkinstalldirs) $(DESTDIR)$(webaccessdir)/js
+       $(INSTALL_PROGRAM) $(iFolderWeb_FORMS) $(DESTDIR)$(webaccessdir)
+       $(INSTALL_PROGRAM) Novell.iFolderWeb.dll $(DEBUG_FILES) $(DESTDIR)$(webaccessdir)/bin
+       $(INSTALL_PROGRAM) $(srcdir)/css/*.css $(DESTDIR)$(webaccessdir)/css
+       $(INSTALL_PROGRAM) $(srcdir)/js/*.js $(DESTDIR)$(webaccessdir)/js
+       cd $(srcdir)/help; cp -r * $(DESTDIR)$(webaccessdir)/help
+       rm -rf `find $(DESTDIR)$(webaccessdir)/help -name .svn`
+       cd $(srcdir)/images; cp -r * $(DESTDIR)$(webaccessdir)/images
+       rm -rf `find $(DESTDIR)$(webaccessdir)/images -name .svn`
+       $(INSTALL_PROGRAM) $(DESTDIR)$(webaccessdir)/../web/bin/SimiasLib.dll $(DESTDIR)$(webaccessdir)/bin
+#if !LINUX
+#      $(INSTALL_PROGRAM) $(LOG4NET_DIR)/log4net.dll $(DESTDIR)$(webaccessdir)/bin
+#endif
+
+uninstall-local:
+       rm -rf $(DESTDIR)$(webaccessdir)
+
+installcheck-local: install
+
+clean-local:
+       rm -rf $(CLEAN_FILES) $(COMMON_CLEAN_FILES)
+
+distclean-local:
+       rm -rf $(COMMON_DISTCLEAN_FILES)
+
+maintainer-clean-local:
+       rm -rf $(COMMON_MAINTAINER_CLEAN_FILES)
+       rm -rf AssemblyInfo.cs
+       rm -rf Log4Net.config
+
Index: src/utils/usercmd/Makefile.am
===================================================================
--- src/utils/usercmd/Makefile.am       (revision 6801)
+++ src/utils/usercmd/Makefile.am       (working copy)
@@ -3,9 +3,12 @@

 UserCmd_CSFILES = \
        $(srcdir)/AssemblyInfo.cs \
-       $(srcdir)/Main.cs \
-       $(srcdir)/AdminService.cs
+       $(srcdir)/Main.cs

+if !SIMIAS_AS_CLIENT
+UserCmd_CSFILES += $(srcdir)/AdminService.cs
+endif
+
 UserCmd_CSFILES_CSC := $(subst /,$(SEP),$(UserCmd_CSFILES))
 UserCmd_INCLUDES =
 UserCmd_RESOURCES =
@@ -36,7 +39,11 @@
 DOC_FILE_CLEAN = *.doc.xml
 endif

+if SIMIAS_AS_CLIENT
+all:
+else
 all: UserCmd.exe
+endif

 AdminService.cs: ../../webservices/iFolderAdmin.wsdl
        wsdl /nologo /out:$@ $<
Index: src/webservices/Makefile.am
===================================================================
--- src/webservices/Makefile.am (revision 6801)
+++ src/webservices/Makefile.am (working copy)
@@ -1,154 +1,167 @@
-# handle Mono secondary dependencies
-export MONO_PATH := $(MONO_PATH)
-
-iFolderWebServiceLocal_CSFILES = \
-       $(srcdir)/AssemblyInfo.cs \
-       $(srcdir)/iFolderCommonLocal.cs \
-       $(srcdir)/iFolderAdminLocal.asmx.cs \
-       $(srcdir)/iFolderWebLocal.asmx.cs \
-       $(srcdir)/iFolder.cs \
-       $(srcdir)/iFolderDetails.cs \
-       $(srcdir)/iFolderType.cs \
-       $(srcdir)/iFolderUser.cs \
-       $(srcdir)/iFolderUserDetails.cs \
-       $(srcdir)/iFolderServer.cs \
-       $(srcdir)/iFolderSystem.cs \
-       $(srcdir)/SystemPolicy.cs \
-       $(srcdir)/iFolderPolicy.cs \
-       $(srcdir)/UserPolicy.cs \
-       $(srcdir)/Exceptions.cs \
-       $(srcdir)/SmartException.cs \
-       $(srcdir)/FileHandler.cs \
-       $(srcdir)/Upload.ashx.cs \
-       $(srcdir)/Download.ashx.cs \
-       $(srcdir)/SearchOperation.cs \
-       $(srcdir)/SearchProperty.cs \
-       $(srcdir)/iFolderEntry.cs \
-       $(srcdir)/iFolderEntryType.cs \
-       $(srcdir)/iFolderFile.cs \
-       $(srcdir)/MemberRole.cs \
-       $(srcdir)/ChangeEntry.cs \
-       $(srcdir)/Settings.cs \
-       $(srcdir)/NodeUtility.cs \
-       $(srcdir)/Rights.cs \
-       $(srcdir)/IdentityPolicy.cs \
-       $(srcdir)/SampleData.cs \
-       $(srcdir)/LastSyncInfo.cs \
-       $(srcdir)/SyncServiceInfo.cs
-
-iFolderWebServiceLocal_WEBFILES = \
-       $(srcdir)/iFolderAdminLocal.asmx \
-       $(srcdir)/iFolderWebLocal.asmx \
-       $(srcdir)/Download.ashx \
-       $(srcdir)/Upload.ashx
-
-iFolderWebService_CSFILES = \
-       $(srcdir)/AssemblyInfo.cs \
-       $(srcdir)/iFolderAdmin.asmx.cs \
-       $(srcdir)/iFolderWeb.asmx.cs \
-       $(srcdir)/iFolderAdminLocalProxy.cs \
-       $(srcdir)/iFolderWebLocalProxy.cs
-
-iFolderWebService_WEBFILES = \
-       $(srcdir)/iFolderAdmin.asmx \
-       $(srcdir)/iFolderWeb.asmx
-
-iFolderWebServiceLocal_CSFILES_CSC := $(subst /,$(SEP),$(iFolderWebServiceLocal_CSFILES))
-iFolderWebServiceLocal_INCLUDES =
-iFolderWebServiceLocal_RESOURCES =
-iFolderWebServiceLocal_FLAGS = $(CSC_LIBFLAG)
-if LINUX
-iFolderWebServiceLocal_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll System.Web.Services.dll SimiasLib.dll SimiasClient.dll Simias.Server.dll
-else
-iFolderWebServiceLocal_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll System.Web.Services.dll SimiasLib.dll SimiasClient.dll Simias.Server.dll
-endif
-iFolderWebServiceLocal_LIBPATH = $(LOG4NET_DIR) ../core/SimiasClient ../core/SimiasLib.dll ../server/Simias.Server
-
-GenerateWsdl_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll System.Web.Services.dll
-
-iFolderWebService_CSFILES_CSC := $(subst /,$(SEP),$(iFolderWebService_CSFILES))
-iFolderWebService_INCLUDES =
-iFolderWebService_RESOURCES =
-iFolderWebService_FLAGS = $(CSC_LIBFLAG)
-if LINUX
-iFolderWebService_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll System.Web.Services.dll SimiasLib.dll SimiasClient.dll Simias.Server.dll iFolder.WebService.Local.dll
-else
-iFolderWebService_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll System.Web.Services.dll SimiasLib.dll SimiasClient.dll Simias.Server.dll iFolder.WebService.Local.dll
-endif
-iFolderWebService_LIBPATH = $(LOG4NET_DIR) ../core/SimiasClient ../core/SimiasLib.dll ../server/Simias.Server
-
-EXTRA_DIST =  AssemblyInfo.cs.in $(iFolderWebServiceLocal_WEBFILES) $(iFolderWebServiceLocal_CSFILES)
-
-if MAKE_DOC_FILE
-DOC_FILE = $(basename $@).doc.xml
-DOC_FILE_CMD = /doc:$(DOC_FILE)
-DOC_FILE_CLEAN = *.doc.xml
-endif
-
-all: iFolder.WebService.dll GenerateWsdl.exe iFolderAdmin.wsdl iFolderWeb.wsdl
-
-iFolder.WebService.Local.dll: copy $(iFolderWebServiceLocal_CSFILES) $(iFolderWebServiceLocal_RESOURCES)
-       $(CSC) /out:$@ $(CSCFLAGS) $(iFolderWebServiceLocal_FLAGS) $(iFolderWebServiceLocal_LIBS:%=/r:%) $(iFolderWebServiceLocal_LIBPATH:%=/lib:%) $(LOG4NET_LIBS) $(iFolderWebServiceLocal_RESOURCES:%=$(ICON_FLAG)%) $(iFolderWebServiceLocal_CSFILES_CSC)
-
-iFolder.WebService.dll: iFolder.WebService.Local.dll $(iFolderWebService_CSFILES) $(iFolderWebService_RESOURCES)
-       $(CSC) /out:$@ $(CSCFLAGS) $(iFolderWebService_FLAGS) $(iFolderWebService_LIBS:%=/r:%) $(iFolderWebService_LIBPATH:%=/lib:%) $(LOG4NET_LIBS) $(iFolderWebService_RESOURCES:%=$(ICON_FLAG)%) $(iFolderWebService_CSFILES_CSC)
-
-GenerateWsdl.exe: GenerateWsdl.cs
-       $(CSC) /out:$@ $(CSCFLAGS) $(CSC_EXEFLAG) $(GenerateWsdl_LIBS:%=/r:%) $<
-
-copy:
-       cp ../core/SimiasClient/SimiasClient.dll .
-       cp ../core/SimiasLib.dll/SimiasLib.dll .
-       cp ../server/Simias.Server/Simias.Server.dll .
-
-iFolderWebLocalProxy.cs: iFolderWebLocal.wsdl
-       wsdl /nologo /namespace:iFolder.WebService.Web /out:$@ $<
-
-iFolderAdminLocalProxy.cs: iFolderAdminLocal.wsdl
-       wsdl /nologo /namespace:iFolder.WebService.Admin /out:$@ $<
-
-iFolderWebLocal.wsdl: copy iFolder.WebService.Local.dll GenerateWsdl.exe
-       $(MONO) GenerateWsdl.exe iFolder.WebService.Local.dll iFolder.WebService.iFolderWebLocal http://127.0.0.1:8086/simias10/iFolderWebLocal.asmx $@
-
-iFolderAdminLocal.wsdl: copy iFolder.WebService.Local.dll GenerateWsdl.exe
-       $(MONO) GenerateWsdl.exe iFolder.WebService.Local.dll iFolder.WebService.iFolderAdminLocal http://127.0.0.1:8086/simias10/iFolderAdminLocal.asmx $@
-
-iFolderWeb.wsdl: copy iFolder.WebService.dll GenerateWsdl.exe
-       $(MONO) GenerateWsdl.exe iFolder.WebService.dll iFolder.WebService.iFolderWeb http://127.0.0.1:8086/simias10/iFolderWeb.asmx $@
-
-iFolderAdmin.wsdl: copy iFolder.WebService.dll GenerateWsdl.exe
-       $(MONO) GenerateWsdl.exe iFolder.WebService.dll iFolder.WebService.iFolderAdmin http://127.0.0.1:8086/simias10/iFolderAdmin.asmx $@
-
-if DEBUG
-if WINDOWS
-DEBUG_FILES = iFolder.WebService.pdb iFolder.WebService.Local.pdb
-endif
-endif
-
-install-exec-local: all $(DATA_FILES)
-       $(mkinstalldirs) $(DESTDIR)$(webdir)
-       $(mkinstalldirs) $(DESTDIR)$(webbindir)
-       $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-       $(INSTALL_PROGRAM) $(iFolderWebServiceLocal_WEBFILES) $(DESTDIR)$(webdir)
-       $(INSTALL_PROGRAM) $(iFolderWebService_WEBFILES) $(DESTDIR)$(webdir)
-       $(INSTALL_PROGRAM) iFolder.WebService.dll iFolder.WebService.Local.dll $(DEBUG_FILES) $(DESTDIR)$(webbindir)
-
-uninstall-local:
-       cd $(DESTDIR)$(webdir); rm -f $(iFolderWebServiceLocal_WEBFILES)
-       cd $(DESTDIR)$(webdir); rm -f $(iFolderWebService_WEBFILES)
-       cd $(DESTDIR)$(webbindir); rm -f iFolder.WebService.dll iFolder.WebService.Local.dll $(DEBUG_FILES)
-
-installcheck-local: install
-
-CLEAN_FILES = iFolder.WebService.dll iFolder.WebService.Local.dll GenerateWsdl.exe *.wsdl $(DOC_FILE_CLEAN)
-
-clean-local:
-       rm -rf $(CLEAN_FILES) $(COMMON_CLEAN_FILES) SimiasClient.dll SimiasLib.dll SimiasServer.dll
-
-distclean-local:
-       rm -rf $(COMMON_DISTCLEAN_FILES)
-
-maintainer-clean-local:
-       rm -rf $(COMMON_MAINTAINER_CLEAN_FILES)
-       rm -rf AssemblyInfo.cs
-
+# handle Mono secondary dependencies
+export MONO_PATH := $(MONO_PATH)
+
+iFolderWebServiceLocal_CSFILES = \
+       $(srcdir)/AssemblyInfo.cs \
+       $(srcdir)/iFolderCommonLocal.cs \
+       $(srcdir)/iFolderAdminLocal.asmx.cs \
+       $(srcdir)/iFolderWebLocal.asmx.cs \
+       $(srcdir)/iFolder.cs \
+       $(srcdir)/iFolderDetails.cs \
+       $(srcdir)/iFolderType.cs \
+       $(srcdir)/iFolderUser.cs \
+       $(srcdir)/iFolderUserDetails.cs \
+       $(srcdir)/iFolderServer.cs \
+       $(srcdir)/iFolderSystem.cs \
+       $(srcdir)/SystemPolicy.cs \
+       $(srcdir)/iFolderPolicy.cs \
+       $(srcdir)/UserPolicy.cs \
+       $(srcdir)/Exceptions.cs \
+       $(srcdir)/SmartException.cs \
+       $(srcdir)/FileHandler.cs \
+       $(srcdir)/Upload.ashx.cs \
+       $(srcdir)/Download.ashx.cs \
+       $(srcdir)/SearchOperation.cs \
+       $(srcdir)/SearchProperty.cs \
+       $(srcdir)/iFolderEntry.cs \
+       $(srcdir)/iFolderEntryType.cs \
+       $(srcdir)/iFolderFile.cs \
+       $(srcdir)/MemberRole.cs \
+       $(srcdir)/ChangeEntry.cs \
+       $(srcdir)/Settings.cs \
+       $(srcdir)/NodeUtility.cs \
+       $(srcdir)/Rights.cs \
+       $(srcdir)/IdentityPolicy.cs \
+       $(srcdir)/SampleData.cs \
+       $(srcdir)/LastSyncInfo.cs \
+       $(srcdir)/SyncServiceInfo.cs
+
+iFolderWebServiceLocal_WEBFILES = \
+       $(srcdir)/iFolderAdminLocal.asmx \
+       $(srcdir)/iFolderWebLocal.asmx \
+       $(srcdir)/Download.ashx \
+       $(srcdir)/Upload.ashx
+
+iFolderWebService_CSFILES = \
+       $(srcdir)/AssemblyInfo.cs \
+       $(srcdir)/iFolderAdmin.asmx.cs \
+       $(srcdir)/iFolderWeb.asmx.cs
+
+
+if !SIMIAS_AS_CLIENT
+iFolderWebService_CSFILES += \
+       $(srcdir)/iFolderAdminLocalProxy.cs \
+       $(srcdir)/iFolderWebLocalProxy.cs
+endif
+
+iFolderWebService_WEBFILES = \
+       $(srcdir)/iFolderAdmin.asmx \
+       $(srcdir)/iFolderWeb.asmx
+
+iFolderWebServiceLocal_CSFILES_CSC := $(subst /,$(SEP),$(iFolderWebServiceLocal_CSFILES))
+iFolderWebServiceLocal_INCLUDES =
+iFolderWebServiceLocal_RESOURCES =
+iFolderWebServiceLocal_FLAGS = $(CSC_LIBFLAG)
+if LINUX
+iFolderWebServiceLocal_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll System.Web.Services.dll SimiasLib.dll SimiasClient.dll Simias.Server.dll
+else
+iFolderWebServiceLocal_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll System.Web.Services.dll SimiasLib.dll SimiasClient.dll Simias.Server.dll
+endif
+iFolderWebServiceLocal_LIBPATH = $(LOG4NET_DIR) ../core/SimiasClient ../core/SimiasLib.dll ../server/Simias.Server
+
+GenerateWsdl_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll System.Web.Services.dll
+
+iFolderWebService_CSFILES_CSC := $(subst /,$(SEP),$(iFolderWebService_CSFILES))
+iFolderWebService_INCLUDES =
+iFolderWebService_RESOURCES =
+iFolderWebService_FLAGS = $(CSC_LIBFLAG)
+if LINUX
+iFolderWebService_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll System.Web.Services.dll SimiasLib.dll SimiasClient.dll Simias.Server.dll iFolder.WebService.Local.dll
+else
+iFolderWebService_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll System.Web.Services.dll SimiasLib.dll SimiasClient.dll Simias.Server.dll iFolder.WebService.Local.dll
+endif
+iFolderWebService_LIBPATH = $(LOG4NET_DIR) ../core/SimiasClient ../core/SimiasLib.dll ../server/Simias.Server
+
+EXTRA_DIST =  AssemblyInfo.cs.in $(iFolderWebServiceLocal_WEBFILES) $(iFolderWebServiceLocal_CSFILES) $(iFolderWebService_CSFILES) $(iFolderWebService_WEBFILES) GenerateWsdl.cs
+
+if MAKE_DOC_FILE
+DOC_FILE = $(basename $@).doc.xml
+DOC_FILE_CMD = /doc:$(DOC_FILE)
+DOC_FILE_CLEAN = *.doc.xml
+endif
+
+if SIMIAS_AS_CLIENT
+all:
+else
+all: iFolder.WebService.dll GenerateWsdl.exe iFolderAdmin.wsdl iFolderWeb.wsdl
+endif
+
+iFolder.WebService.Local.dll: copy $(iFolderWebServiceLocal_CSFILES) $(iFolderWebServiceLocal_RESOURCES)
+       $(CSC) /out:$@ $(CSCFLAGS) $(iFolderWebServiceLocal_FLAGS) $(iFolderWebServiceLocal_LIBS:%=/r:%) $(iFolderWebServiceLocal_LIBPATH:%=/lib:%) $(LOG4NET_LIBS) $(iFolderWebServiceLocal_RESOURCES:%=$(ICON_FLAG)%) $(iFolderWebServiceLocal_CSFILES_CSC)
+
+iFolder.WebService.dll: iFolder.WebService.Local.dll $(iFolderWebService_CSFILES) $(iFolderWebService_RESOURCES)
+       $(CSC) /out:$@ $(CSCFLAGS) $(iFolderWebService_FLAGS) $(iFolderWebService_LIBS:%=/r:%) $(iFolderWebService_LIBPATH:%=/lib:%) $(LOG4NET_LIBS) $(iFolderWebService_RESOURCES:%=$(ICON_FLAG)%) $(iFolderWebService_CSFILES_CSC)
+
+GenerateWsdl.exe: GenerateWsdl.cs
+       $(CSC) /out:$@ $(CSCFLAGS) $(CSC_EXEFLAG) $(GenerateWsdl_LIBS:%=/r:%) $<
+
+if SIMIAS_AS_CLIENT
+copy:
+else
+copy:
+       cp ../core/SimiasClient/SimiasClient.dll .
+       cp ../core/SimiasLib.dll/SimiasLib.dll .
+       cp ../server/Simias.Server/Simias.Server.dll .
+endif
+
+iFolderWebLocalProxy.cs: iFolderWebLocal.wsdl
+       wsdl /nologo /namespace:iFolder.WebService.Web /out:$@ $<
+
+iFolderAdminLocalProxy.cs: iFolderAdminLocal.wsdl
+       wsdl /nologo /namespace:iFolder.WebService.Admin /out:$@ $<
+
+iFolderWebLocal.wsdl: copy iFolder.WebService.Local.dll GenerateWsdl.exe
+       $(MONO) GenerateWsdl.exe iFolder.WebService.Local.dll iFolder.WebService.iFolderWebLocal http://127.0.0.1:8086/simias10/iFolderWebLocal.asmx $@
+
+iFolderAdminLocal.wsdl: copy iFolder.WebService.Local.dll GenerateWsdl.exe
+       $(MONO) GenerateWsdl.exe iFolder.WebService.Local.dll iFolder.WebService.iFolderAdminLocal http://127.0.0.1:8086/simias10/iFolderAdminLocal.asmx $@
+
+iFolderWeb.wsdl: copy iFolder.WebService.dll GenerateWsdl.exe
+       $(MONO) GenerateWsdl.exe iFolder.WebService.dll iFolder.WebService.iFolderWeb http://127.0.0.1:8086/simias10/iFolderWeb.asmx $@
+
+iFolderAdmin.wsdl: copy iFolder.WebService.dll GenerateWsdl.exe
+       $(MONO) GenerateWsdl.exe iFolder.WebService.dll iFolder.WebService.iFolderAdmin http://127.0.0.1:8086/simias10/iFolderAdmin.asmx $@
+
+if DEBUG
+if WINDOWS
+DEBUG_FILES = iFolder.WebService.pdb iFolder.WebService.Local.pdb
+endif
+endif
+
+install-exec-local: all $(DATA_FILES)
+       $(mkinstalldirs) $(DESTDIR)$(webdir)
+       $(mkinstalldirs) $(DESTDIR)$(webbindir)
+       $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+       $(INSTALL_PROGRAM) $(iFolderWebServiceLocal_WEBFILES) $(DESTDIR)$(webdir)
+       $(INSTALL_PROGRAM) $(iFolderWebService_WEBFILES) $(DESTDIR)$(webdir)
+       $(INSTALL_PROGRAM) iFolder.WebService.dll iFolder.WebService.Local.dll $(DEBUG_FILES) $(DESTDIR)$(webbindir)
+
+uninstall-local:
+       cd $(DESTDIR)$(webdir); rm -f $(iFolderWebServiceLocal_WEBFILES)
+       cd $(DESTDIR)$(webdir); rm -f $(iFolderWebService_WEBFILES)
+       cd $(DESTDIR)$(webbindir); rm -f iFolder.WebService.dll iFolder.WebService.Local.dll $(DEBUG_FILES)
+
+installcheck-local: install
+
+CLEAN_FILES = iFolder.WebService.dll iFolder.WebService.Local.dll GenerateWsdl.exe *.wsdl $(DOC_FILE_CLEAN)
+
+clean-local:
+       rm -rf $(CLEAN_FILES) $(COMMON_CLEAN_FILES) SimiasClient.dll SimiasLib.dll SimiasServer.dll
+
+distclean-local:
+       rm -rf $(COMMON_DISTCLEAN_FILES)
+
+maintainer-clean-local:
+       rm -rf $(COMMON_MAINTAINER_CLEAN_FILES)
+       rm -rf AssemblyInfo.cs
+
Index: src/server/Makefile.am
===================================================================
--- src/server/Makefile.am      (revision 6801)
+++ src/server/Makefile.am      (working copy)
@@ -1,6 +1,6 @@
 SUBDIRS = Simias.Server Simias.HostService Simias.HttpFile Simias.Rss Simias.LdapProvider Simias.ADLdapProvider Simias.OpenLdapProvider Simias.ClientUpdate setup DiscoveryWS

-DIST_SUBDIRS = $(SUBDIRS) setup
+DIST_SUBDIRS = $(SUBDIRS)

 # handle Mono secondary dependencies
 export MONO_PATH := $(MONO_PATH):$(DESTDIR)$(libdir)
Index: src/admin/Makefile.am
===================================================================
--- src/admin/Makefile.am       (revision 6801)
+++ src/admin/Makefile.am       (working copy)
@@ -1,172 +1,175 @@
-# handle Mono secondary dependencies
-export MONO_PATH := $(MONO_PATH)
-iFolderAdmin_CSFILES = \
-       $(srcdir)/AccountEnabled.ascx.cs \
-       $(srcdir)/AssemblyInfo.cs \
-       $(srcdir)/CreateiFolder.aspx.cs \
-       $(srcdir)/CreateUser.aspx.cs \
-       $(srcdir)/Default.aspx.cs \
-       $(srcdir)/DiskSpaceQuota.ascx.cs \
-       $(srcdir)/SecurityState.ascx.cs \
-       $(srcdir)/Error.aspx.cs \
-       $(srcdir)/FileSizeFilter.ascx.cs \
-       $(srcdir)/FileTypeFilter.ascx.cs \
-       $(srcdir)/Footer.ascx.cs \
-       $(srcdir)/Global.asax.cs \
-       $(srcdir)/Header.ascx.cs \
-       $(srcdir)/iFolderAdminPage.aspx.cs \
-       $(srcdir)/iFolderAdminWebProxy.cs \
-       $(srcdir)/iFolderDetailsPage.aspx.cs \
-       $(srcdir)/iFolderEnabled.ascx.cs \
-       $(srcdir)/iFolders.aspx.cs \
-       $(srcdir)/iFolderSearch.ascx.cs \
-       $(srcdir)/iFolderWebLogger.cs \
-       $(srcdir)/ListFooter.ascx.cs \
-       $(srcdir)/Login.aspx.cs \
-       $(srcdir)/LogTailHandler.ashx.cs \
-       $(srcdir)/MemberSearch.ascx.cs \
-       $(srcdir)/MemberSelect.aspx.cs \
-       $(srcdir)/OwnerSelect.aspx.cs \
-       $(srcdir)/Policy.ascx.cs \
-       $(srcdir)/ReportLogHandler.ashx.cs \
-       $(srcdir)/Reports.aspx.cs \
-       $(srcdir)/ServerDetails.aspx.cs \
-       $(srcdir)/Servers.aspx.cs \
-       $(srcdir)/SyncInterval.ascx.cs \
-       $(srcdir)/SystemInfo.aspx.cs \
-       $(srcdir)/TopNavigation.ascx.cs \
-       $(srcdir)/UserDetails.aspx.cs \
-       $(srcdir)/Users.aspx.cs \
-       $(srcdir)/Utils.cs
-
-iFolderAdmin_CSFILES_CSC := $(subst /,$(SEP),$(iFolderAdmin_CSFILES))
-
-iFolderAdmin_INCLUDES =
-
-iFolderAdmin_RESX = \
-       $(srcdir)/iFolderAdmin.resx
-#      $(shell ls $(srcdir)/iFolderAdmin.*.resx)
-
-iFolderAdmin_RESOURCES := $(iFolderAdmin_RESX:$(srcdir)/%.resx=$(srcdir)/Novell.iFolderWeb.Admin.%.resources)
-
-iFolderAdmin_FLAGS = $(CSC_LIBFLAG)
-
-iFolderAdmin_LIBS = \
-       System.dll \
-       System.Data.dll \
-       $(SYSTEM_XML) \
-       System.Drawing.dll \
-       System.Web.dll \
-       System.Web.Services.dll \
-       $(srcdir)/../core/SimiasLib.dll/SimiasLib.dll
-
-#if !LINUX
-#      iFolderAdmin_LIBS := $(iFolderAdmin_LIBS) log4net.dll
-#endif
-
-#iFolderAdmin_LIBPATH = $(LOG4NET_DIR)
-
-
-iFolderAdmin_FORMS = \
-       AccountEnabled.ascx \
-       CreateiFolder.aspx \
-       CreateUser.aspx \
-       Default.aspx \
-       DiskSpaceQuota.ascx \
-       SecurityState.ascx \
-       Error.aspx \
-       FileSizeFilter.ascx \
-       FileTypeFilter.ascx \
-       Footer.ascx \
-       Global.asax \
-       Header.ascx \
-       iFolderAdminPage.aspx \
-       iFolderDetailsPage.aspx \
-       iFolderEnabled.ascx \
-       iFolders.aspx \
-       iFolderSearch.ascx \
-       ListFooter.ascx \
-       Log4Net.config \
-       Login.aspx \
-       LogTailHandler.ashx \
-       MemberSearch.ascx \
-       MemberSelect.aspx \
-       OwnerSelect.aspx \
-       Policy.ascx \
-       ReportLogHandler.ashx \
-       Reports.aspx \
-       ServerDetails.aspx \
-       Servers.aspx \
-       SyncInterval.ascx \
-       SystemInfo.aspx \
-       TopNavigation.ascx \
-       UserDetails.aspx \
-       Users.aspx \
-       Web.config
-
-EXTRA_DIST = AssemblyInfo.cs.in Log4Net.config.in $(iFolderAdmin_CSFILES) $(iFolderAdmin_FORMS) css images help $(iFolderAdmin_RESX) tail.txt
-
-dist-hook:
-       rm -rf `find $(distdir)/help -name .svn`
-       rm -rf `find $(distdir)/images -name .svn`
-       rm -rf `find $(distdir)/css -name .svn`
-
-if DEBUG
-if WINDOWS
-DEBUG_FILES = Novell.iFolderAdmin.pdb
-endif
-endif
-
-CLEAN_FILES = Novell.iFolderAdmin.dll \
-       $(iFolderAdmin_RESOURCES) \
-       $(DEBUG_FILES)
-
-all: Novell.iFolderAdmin.dll
-
-iFolderAdminWebProxy.cs: ../webservices/iFolderAdmin.wsdl
-       wsdl /nologo /out:$@ $<
-
-Novell.iFolderAdmin.dll: iFolderAdminWebProxy.cs $(iFolderAdmin_CSFILES) $(iFolderAdmin_RESOURCES)
-       $(CSC) /out:$@ $(CSCFLAGS) $(iFolderAdmin_FLAGS) $(iFolderAdmin_LIBS:%=/r:%) $(iFolderAdmin_RESOURCES:%=/res:%) $(iFolderAdmin_LIBPATH:%=/lib:%) $(iFolderAdmin_CSFILES_CSC)
-
-Novell.iFolderWeb.Admin.%.resources : %.resx
-       $(RESGEN) $< $@
-
-install-exec-local: all
-       rm -rf $(DESTDIR)$(admindir)
-       $(mkinstalldirs) $(DESTDIR)$(admindir)
-       $(mkinstalldirs) $(DESTDIR)$(admindir)/bin
-       $(mkinstalldirs) $(DESTDIR)$(admindir)/images
-       $(mkinstalldirs) $(DESTDIR)$(admindir)/css
-       $(mkinstalldirs) $(DESTDIR)$(admindir)/help
-       $(mkinstalldirs) $(DESTDIR)$(admindir)/tail
-       $(INSTALL_PROGRAM) $(iFolderAdmin_FORMS) $(DESTDIR)$(admindir)
-       $(INSTALL_PROGRAM) Novell.iFolderAdmin.dll $(DEBUG_FILES) $(DESTDIR)$(admindir)/bin
-       $(INSTALL_PROGRAM) tail.txt $(DESTDIR)$(admindir)/tail
-       cd $(srcdir)/help; cp -r * $(DESTDIR)$(admindir)/help
-       rm -rf `find $(DESTDIR)$(admindir)/help -name .svn`
-       cd $(srcdir)/images; cp -r * $(DESTDIR)$(admindir)/images
-       rm -rf `find $(DESTDIR)$(admindir)/images -name .svn`
-       cd $(srcdir)/css; cp -r * $(DESTDIR)$(admindir)/css
-       rm -rf `find $(DESTDIR)$(admindir)/css -name .svn`
-       $(INSTALL_PROGRAM) $(DESTDIR)$(admindir)/../web/bin/SimiasLib.dll $(DESTDIR)$(admindir)/bin/
-#if !LINUX
-#      $(INSTALL_PROGRAM) $(LOG4NET_DIR)/log4net.dll $(DESTDIR)$(admindir)/bin
-#endif
-
-uninstall-local:
-       rm -rf $(DESTDIR)$(admindir)
-
-installcheck-local: install
-
-clean-local:
-       rm -rf $(CLEAN_FILES) $(COMMON_CLEAN_FILES)
-
-distclean-local:
-       rm -rf $(COMMON_DISTCLEAN_FILES)
-
-maintainer-clean-local:
-       rm -rf $(COMMON_MAINTAINER_CLEAN_FILES)
-       rm -rf AssemblyInfo.cs
-       rm -rf Log4Net.config
-
+# handle Mono secondary dependencies
+export MONO_PATH := $(MONO_PATH)
+iFolderAdmin_CSFILES = \
+       $(srcdir)/AccountEnabled.ascx.cs \
+       $(srcdir)/AssemblyInfo.cs \
+       $(srcdir)/CreateiFolder.aspx.cs \
+       $(srcdir)/CreateUser.aspx.cs \
+       $(srcdir)/Default.aspx.cs \
+       $(srcdir)/DiskSpaceQuota.ascx.cs \
+       $(srcdir)/SecurityState.ascx.cs \
+       $(srcdir)/Error.aspx.cs \
+       $(srcdir)/FileSizeFilter.ascx.cs \
+       $(srcdir)/FileTypeFilter.ascx.cs \
+       $(srcdir)/Footer.ascx.cs \
+       $(srcdir)/Global.asax.cs \
+       $(srcdir)/Header.ascx.cs \
+       $(srcdir)/iFolderAdminPage.aspx.cs \
+       $(srcdir)/iFolderDetailsPage.aspx.cs \
+       $(srcdir)/iFolderEnabled.ascx.cs \
+       $(srcdir)/iFolders.aspx.cs \
+       $(srcdir)/iFolderSearch.ascx.cs \
+       $(srcdir)/iFolderWebLogger.cs \
+       $(srcdir)/ListFooter.ascx.cs \
+       $(srcdir)/Login.aspx.cs \
+       $(srcdir)/LogTailHandler.ashx.cs \
+       $(srcdir)/MemberSearch.ascx.cs \
+       $(srcdir)/MemberSelect.aspx.cs \
+       $(srcdir)/OwnerSelect.aspx.cs \
+       $(srcdir)/Policy.ascx.cs \
+       $(srcdir)/ReportLogHandler.ashx.cs \
+       $(srcdir)/Reports.aspx.cs \
+       $(srcdir)/ServerDetails.aspx.cs \
+       $(srcdir)/Servers.aspx.cs \
+       $(srcdir)/SyncInterval.ascx.cs \
+       $(srcdir)/SystemInfo.aspx.cs \
+       $(srcdir)/TopNavigation.ascx.cs \
+       $(srcdir)/UserDetails.aspx.cs \
+       $(srcdir)/Users.aspx.cs \
+       $(srcdir)/Utils.cs
+
+if !SIMIAS_AS_CLIENT
+iFolderAdmin_CSFILES += $(srcdir)/iFolderAdminWebProxy.cs
+endif
+
+iFolderAdmin_CSFILES_CSC := $(subst /,$(SEP),$(iFolderAdmin_CSFILES))
+
+iFolderAdmin_INCLUDES =
+
+iFolderAdmin_RESX = \
+       $(srcdir)/iFolderAdmin.resx
+#      $(shell ls $(srcdir)/iFolderAdmin.*.resx)
+
+iFolderAdmin_RESOURCES := $(iFolderAdmin_RESX:$(srcdir)/%.resx=$(srcdir)/Novell.iFolderWeb.Admin.%.resources)
+
+iFolderAdmin_FLAGS = $(CSC_LIBFLAG)
+
+iFolderAdmin_LIBS = \
+       System.dll \
+       System.Data.dll \
+       $(SYSTEM_XML) \
+       System.Drawing.dll \
+       System.Web.dll \
+       System.Web.Services.dll \
+       $(srcdir)/../core/SimiasLib.dll/SimiasLib.dll
+
+#if !LINUX
+#      iFolderAdmin_LIBS := $(iFolderAdmin_LIBS) log4net.dll
+#endif
+
+#iFolderAdmin_LIBPATH = $(LOG4NET_DIR)
+
+
+iFolderAdmin_FORMS = \
+       AccountEnabled.ascx \
+       CreateiFolder.aspx \
+       CreateUser.aspx \
+       Default.aspx \
+       DiskSpaceQuota.ascx \
+       SecurityState.ascx \
+       Error.aspx \
+       FileSizeFilter.ascx \
+       FileTypeFilter.ascx \
+       Footer.ascx \
+       Global.asax \
+       Header.ascx \
+       iFolderAdminPage.aspx \
+       iFolderDetailsPage.aspx \
+       iFolderEnabled.ascx \
+       iFolders.aspx \
+       iFolderSearch.ascx \
+       ListFooter.ascx \
+       Log4Net.config \
+       Login.aspx \
+       LogTailHandler.ashx \
+       MemberSearch.ascx \
+       MemberSelect.aspx \
+       OwnerSelect.aspx \
+       Policy.ascx \
+       ReportLogHandler.ashx \
+       Reports.aspx \
+       ServerDetails.aspx \
+       Servers.aspx \
+       SyncInterval.ascx \
+       SystemInfo.aspx \
+       TopNavigation.ascx \
+       UserDetails.aspx \
+       Users.aspx \
+       Web.config
+
+EXTRA_DIST = AssemblyInfo.cs.in Log4Net.config.in $(iFolderAdmin_CSFILES) $(iFolderAdmin_FORMS) css images help $(iFolderAdmin_RESX) tail.txt
+
+dist-hook:
+       rm -rf `find $(distdir)/help -name .svn`
+       rm -rf `find $(distdir)/images -name .svn`
+       rm -rf `find $(distdir)/css -name .svn`
+
+if DEBUG
+if WINDOWS
+DEBUG_FILES = Novell.iFolderAdmin.pdb
+endif
+endif
+
+CLEAN_FILES = Novell.iFolderAdmin.dll \
+       $(iFolderAdmin_RESOURCES) \
+       $(DEBUG_FILES)
+
+all: Novell.iFolderAdmin.dll
+
+iFolderAdminWebProxy.cs: ../webservices/iFolderAdmin.wsdl
+       wsdl /nologo /out:$@ $<
+
+Novell.iFolderAdmin.dll: iFolderAdminWebProxy.cs $(iFolderAdmin_CSFILES) $(iFolderAdmin_RESOURCES)
+       $(CSC) /out:$@ $(CSCFLAGS) $(iFolderAdmin_FLAGS) $(iFolderAdmin_LIBS:%=/r:%) $(iFolderAdmin_RESOURCES:%=/res:%) $(iFolderAdmin_LIBPATH:%=/lib:%) $(iFolderAdmin_CSFILES_CSC)
+
+Novell.iFolderWeb.Admin.%.resources : %.resx
+       $(RESGEN) $< $@
+
+install-exec-local: all
+       rm -rf $(DESTDIR)$(admindir)
+       $(mkinstalldirs) $(DESTDIR)$(admindir)
+       $(mkinstalldirs) $(DESTDIR)$(admindir)/bin
+       $(mkinstalldirs) $(DESTDIR)$(admindir)/images
+       $(mkinstalldirs) $(DESTDIR)$(admindir)/css
+       $(mkinstalldirs) $(DESTDIR)$(admindir)/help
+       $(mkinstalldirs) $(DESTDIR)$(admindir)/tail
+       $(INSTALL_PROGRAM) $(iFolderAdmin_FORMS) $(DESTDIR)$(admindir)
+       $(INSTALL_PROGRAM) Novell.iFolderAdmin.dll $(DEBUG_FILES) $(DESTDIR)$(admindir)/bin
+       $(INSTALL_PROGRAM) tail.txt $(DESTDIR)$(admindir)/tail
+       cd $(srcdir)/help; cp -r * $(DESTDIR)$(admindir)/help
+       rm -rf `find $(DESTDIR)$(admindir)/help -name .svn`
+       cd $(srcdir)/images; cp -r * $(DESTDIR)$(admindir)/images
+       rm -rf `find $(DESTDIR)$(admindir)/images -name .svn`
+       cd $(srcdir)/css; cp -r * $(DESTDIR)$(admindir)/css
+       rm -rf `find $(DESTDIR)$(admindir)/css -name .svn`
+       $(INSTALL_PROGRAM) $(DESTDIR)$(admindir)/../web/bin/SimiasLib.dll $(DESTDIR)$(admindir)/bin/
+#if !LINUX
+#      $(INSTALL_PROGRAM) $(LOG4NET_DIR)/log4net.dll $(DESTDIR)$(admindir)/bin
+#endif
+
+uninstall-local:
+       rm -rf $(DESTDIR)$(admindir)
+
+installcheck-local: install
+
+clean-local:
+       rm -rf $(CLEAN_FILES) $(COMMON_CLEAN_FILES)
+
+distclean-local:
+       rm -rf $(COMMON_DISTCLEAN_FILES)
+
+maintainer-clean-local:
+       rm -rf $(COMMON_MAINTAINER_CLEAN_FILES)
+       rm -rf AssemblyInfo.cs
+       rm -rf Log4Net.config
+
Index: src/Makefile.am
===================================================================
--- src/Makefile.am     (revision 6801)
+++ src/Makefile.am     (working copy)
@@ -5,7 +5,7 @@
 SUBDIRS = core server webservices webaccess admin setup utils
 endif

-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = core client server webservices webaccess admin setup utils

 EXTRA_DIST =