Hello once again,
Greetings!!
On 3/4/07, B S Srinidhi <[EMAIL PROTECTED]> wrote:
Hello everyone,
Finally, I could malloc() some time to work on Makefiles of both simias
and ifolder so that they generate (successfully) a usable tarball.
Updated the two patches to apply against trunk. Please have a look at
these patches. It would be nice if we had them inside SVN.
Thanks,
Srinidhi.
--
ASCII ribbon campaign ( ) B S Srinidhi
- against HTML email X http://www.srinidhi-is.in
& vCards / \ Bangalore
Index: configure.in
===================================================================
--- configure.in (revision 6788)
+++ 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"
Index: src/utils/usercmd/Makefile.am
===================================================================
--- src/utils/usercmd/Makefile.am (revision 6788)
+++ 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/server/Makefile.am
===================================================================
--- src/server/Makefile.am (revision 6788)
+++ 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/Makefile.am
===================================================================
--- src/Makefile.am (revision 6788)
+++ 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 =
Index: help-linux/Makefile.am
===================================================================
--- help-linux/Makefile.am (revision 6534)
+++ help-linux/Makefile.am (working copy)
@@ -1,5 +1,8 @@
EXTRA_DIST = en cs de es fr hu it ja pl pt ru sk zh-CN zh-TW
+dist-hook:
+ rm -rf `find $(distdir) -name ".svn"`
+
install-exec-local:
$(mkinstalldirs) $(DESTDIR)$(datadir)/ifolder3/help
cp -r $(EXTRA_DIST) $(DESTDIR)$(datadir)/ifolder3/help
Index: configure.in
===================================================================
--- configure.in (revision 6534)
+++ configure.in (working copy)
@@ -1,9 +1,10 @@
-AC_INIT(src/WebService/iFolder.cs)
+AC_INIT(ifolder3, 3.6)
+AC_CONFIG_SRCDIR(src/WebService/iFolder.cs)
AC_CANONICAL_SYSTEM
AM_CONFIG_HEADER(config.h)
m4_pattern_allow(PKG_CONFIG)
-AM_INIT_AUTOMAKE(ifolder3, 3.6)
+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"
Index: src/WebService/Makefile.am
===================================================================
--- src/WebService/Makefile.am (revision 6534)
+++ src/WebService/Makefile.am (working copy)
@@ -10,7 +10,7 @@
iFolderWebService_LIBPATH = $(LOG4NET_DIR) $(webbindir)
GenerateWsdl_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll
System.Web.Services.dll
-EXTRA_DIST = iFolder.asmx $(iFolderWebService_CSFILES) AssemblyInfo.cs.in
+EXTRA_DIST = iFolder.asmx $(iFolderWebService_CSFILES) AssemblyInfo.cs.in
GenerateWsdl.cs
AssemblyInfo.cs: $(srcdir)/AssemblyInfo.cs.in Makefile
sed -e 's,@_VERSION_@,@VERSION@,g' $< > $@
Index: Makefile.am
===================================================================
--- Makefile.am (revision 6534)
+++ Makefile.am (working copy)
@@ -1,11 +1,10 @@
if LINUX
SUBDIRS = src help-linux po
-DIST_SUBDIRS = $(SUBDIRS) doc package test
else
SUBDIRS = src help po
-DIST_SUBDIRS = $(SUBDIRS) doc package test help-linux
endif
+DIST_SUBDIRS = $(SUBDIRS) doc package test help-linux help po
# remove all of the CVS directories
dist-hook:
@@ -20,10 +19,10 @@
endif
endif
-EXTRA_DIST = \
- tools \
- $(srcdir)/$(PACKAGE)*.pc.in \
- $(ADDITIONAL_LIB_FILES) \
+EXTRA_DIST = \
+ tools \
+ $(srcdir)/$(PACKAGE)*.pc.in \
+ $(ADDITIONAL_LIB_FILES) \
$(srcdir)/intltool-*.in
all: ifolder3.pc ifolder3-c.pc
_______________________________________________
ifolder-dev mailing list
[email protected]
http://forge.novell.com/mailman/listinfo/ifolder-dev
