Unnamed

dl9pf@glorfindel:~/svn/simias/trunk/simias-test> for i in `find . -name "*.rej"` ; do echo ""; echo "#############" ; echo $i ; echo "###########" ; cat $i ; echo "# # # # # # # # #" ; done

#############
./src/webaccess/Makefile.am.rej
###########
***************
*** 18,24 ****
        $(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 \
--- 18,23 ----
        $(srcdir)/History.aspx.cs \
        $(srcdir)/Members.aspx.cs \
        $(srcdir)/iFolders.aspx.cs \
        $(srcdir)/Login.aspx.cs \
        $(srcdir)/Message.ascx.cs \
        $(srcdir)/Pagging.ascx.cs \
***************
*** 38,43 ****
        $(srcdir)/WebUtility.cs
  #     $(srcdir)/../core/Encryption/Blowfish.cs


  iFolderWeb_CSFILES_CSC := $(subst /,$(SEP),$(iFolderWeb_CSFILES))

--- 37,45 ----
        $(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))

# # # # # # # # #

#############
./src/webservices/Makefile.am.rej
###########
***************
*** 45,53 ****
  iFolderWebService_CSFILES = \
        $(srcdir)/AssemblyInfo.cs \
        $(srcdir)/iFolderAdmin.asmx.cs \
-       $(srcdir)/iFolderWeb.asmx.cs \
        $(srcdir)/iFolderAdminLocalProxy.cs \
        $(srcdir)/iFolderWebLocalProxy.cs

  iFolderWebService_WEBFILES = \
        $(srcdir)/iFolderAdmin.asmx \
--- 45,58 ----
  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 \
***************
*** 77,83 ****
  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
--- 82,88 ----
  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
***************
*** 85,91 ****
  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)
--- 90,100 ----
  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)
***************
*** 96,105 ****
  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:$@ $<
--- 105,118 ----
  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:$@ $<
# # # # # # # # #

#############
./src/admin/Makefile.am.rej
###########
***************
*** 15,21 ****
        $(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 \
--- 15,20 ----
        $(srcdir)/Global.asax.cs \
        $(srcdir)/Header.ascx.cs \
        $(srcdir)/iFolderAdminPage.aspx.cs \
        $(srcdir)/iFolderDetailsPage.aspx.cs \
        $(srcdir)/iFolderEnabled.ascx.cs \
        $(srcdir)/iFolders.aspx.cs \
***************
*** 39,44 ****
        $(srcdir)/Users.aspx.cs \
        $(srcdir)/Utils.cs

  iFolderAdmin_CSFILES_CSC := $(subst /,$(SEP),$(iFolderAdmin_CSFILES))

  iFolderAdmin_INCLUDES =
--- 38,47 ----
        $(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 =
# # # # # # # # #