Update of /cvsroot/mahogany/M
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30362
Modified Files:
Makefile configure configure.in
Log Message:
3rd party libraries are now in li and not extra/src
Index: Makefile
===================================================================
RCS file: /cvsroot/mahogany/M/Makefile,v
retrieving revision 1.76
retrieving revision 1.77
diff -b -u -2 -r1.76 -r1.77
--- Makefile 21 Apr 2004 17:42:50 -0000 1.76
+++ Makefile 2 May 2004 12:32:44 -0000 1.77
@@ -18,7 +18,7 @@
FILES := configure.in configure Makefile makeopts.in makerules
ifeq ($(USE_RESOURCES),yes)
-SUB_DIRS := include extra res src
+SUB_DIRS := include lib res src
else
-SUB_DIRS := include extra src
+SUB_DIRS := include lib src
endif
ALL_DIRS := $(SUB_DIRS) doc
@@ -34,5 +34,5 @@
doc:
- set -e; for i in extra doc; do $(MAKE) -C $$i doc; done
+ set -e; for i in doc; do $(MAKE) -C $$i doc; done
classdoc:
@@ -84,5 +84,5 @@
fi \
done
- set -e; for i in $(SUB_DIRS); do $(MAKE) -C $$i install; done
+ set -e; for i in $(SUB_DIRS) extra; do $(MAKE) -C $$i install; done
set -e; for i in .src/doc/Tips/Tips*.txt; \
do $(INSTALL_DATA) $$i $(DOCDIR)/Tips; \
Index: configure
===================================================================
RCS file: /cvsroot/mahogany/M/configure,v
retrieving revision 1.316
retrieving revision 1.317
diff -b -u -2 -r1.316 -r1.317
--- configure 11 Jan 2004 22:21:16 -0000 1.316
+++ configure 2 May 2004 12:32:45 -0000 1.317
@@ -567,5 +567,5 @@
-# From configure.in Id: configure.in,v 1.302 2004/01/10 21:24:45 vadz Exp
+# From configure.in Id: configure.in,v 1.303 2004/01/11 22:21:16 vadz Exp
rm -f conftestdata
@@ -4835,5 +4835,5 @@
echo "$ac_t""unknown" 1>&6
{ echo "configure: error: cannot guess c-client OS type for $OSTYPE,
-please have a look at extra/src/c-client/Makefile and use --with-ccostype=xxx
+please have a look at lib/imap/Makefile and use --with-ccostype=xxx
with xxx being the most appropriate system type from this file." 1>&2; exit 1; }
;;
@@ -5029,9 +5029,9 @@
'') ;;
*)
- echo $ac_n "checking for libmal in extra/src""... $ac_c" 1>&6
-echo "configure:5033: checking for libmal in extra/src" >&5
- if test ! -d $srcdir/extra/src/libmal
+ echo $ac_n "checking for libmal in lib""... $ac_c" 1>&6
+echo "configure:5033: checking for libmal in lib" >&5
+ if test ! -d $srcdir/lib/libmal
then echo "$ac_t""not found - no MAL synch for PalmOS" 1>&6
- elif test -f $srcdir/extra/src/libmal/Makefile.in \
+ elif test -f $srcdir/lib/libmal/Makefile.in \
-a "$SOURCEDIR" != "$BUILDDIR"
then echo "$ac_t""old-style libmal not supported in separate build tree"
1>&6
@@ -5344,5 +5344,5 @@
-CPPFLAGS="-I$SOURCEDIR/include $CPPFLAGS -I$SOURCEDIR/extra/include"
+CPPFLAGS="-I$SOURCEDIR/include $CPPFLAGS"
case "$BUILDDIR" in "$SOURCEDIR") ;; *)
CPPFLAGS="-I$BUILDDIR/include $CPPFLAGS" ;;
@@ -5359,8 +5359,8 @@
-CPPFLAGS="$CPPFLAGS -I$BUILDDIR/extra/src/c-client"
-LIBS="$BUILDDIR/extra/src/c-client/c-client.a $LIBS"
-CPPFLAGS="$CPPFLAGS -I$SOURCEDIR/extra/src/compface -I$SOURCEDIR/src/wx/vcard"
-LIBS="$LIBS -L$BUILDDIR/extra/src/compface -lMcompface"
+CPPFLAGS="$CPPFLAGS -I$BUILDDIR/lib/imap/c-client"
+LIBS="$BUILDDIR/lib/imap/c-client/c-client.a $LIBS"
+CPPFLAGS="$CPPFLAGS -I$SOURCEDIR/lib/compface -I$SOURCEDIR/src/wx/vcard"
+LIBS="$BUILDDIR/lib/compface/compface.a $LIBS"
@@ -5467,21 +5467,31 @@
+# gather all directories where we want to create .src links in DIR and all
+# Makefiles in COPY
OUTPUT="makeopts"
COPY=Makefile
DIR=
-for dir in `cd $srcdir; find include extra src locale doc res -type d -print`
-do case "$dir" in
- CVS | */CVS) continue ;;
- extra/src) DIR="$DIR $dir" ;; # no Makefile in this dir
- extra/src/libmal) DIR="$DIR $dir"; continue ;;
- extra/src/libmal*) continue ;;
- esac
- if test -f $srcdir/$dir/Names.mk
- then
- DIR="$DIR $dir"
- elif test -f $srcdir/$dir/Makefile
- then COPY="$COPY $dir/Makefile"
- DIR="$DIR $dir"
+for dir in `cd $srcdir; find include lib extra src locale doc res -type d -print`; do
+ case "$dir" in
+ CVS | */CVS | \
+ lib/imap/* | \
+ extra/src/c-client | \
+ extra/src/compface | \
+ extra/src/imap* | \
+ extra/src/libmal*)
+ # ignore
+ ;;
+
+ *)
+ # normal case
+ if test -f $srcdir/$dir/Makefile.M; then
+ COPY="$COPY $dir/Makefile.M"
+ elif test -f $srcdir/$dir/Makefile; then
+ COPY="$COPY $dir/Makefile"
+ elif test ! -f $srcdir/$dir/Names.mk; then
+ continue
fi
+ DIR="$DIR $dir"
+ esac
done
# HACK for backward compatibility; clean it up when old libmal is dead
@@ -5940,5 +5950,5 @@
echo "linking $mf"
rm -f $mf
- ln -s .src/Makefile $mf
+ ln -s .src/`basename $mf` $mf
done
;;
Index: configure.in
===================================================================
RCS file: /cvsroot/mahogany/M/configure.in,v
retrieving revision 1.303
retrieving revision 1.304
diff -b -u -2 -r1.303 -r1.304
--- configure.in 11 Jan 2004 22:21:16 -0000 1.303
+++ configure.in 2 May 2004 12:32:57 -0000 1.304
@@ -1089,5 +1089,5 @@
AC_MSG_RESULT(unknown)
AC_MSG_ERROR([cannot guess c-client OS type for $OSTYPE,
-please have a look at extra/src/c-client/Makefile and use --with-ccostype=xxx
+please have a look at lib/imap/Makefile and use --with-ccostype=xxx
with xxx being the most appropriate system type from this file.])
;;
@@ -1130,13 +1130,13 @@
AC_SUBST(MAKE_PISOCKLIB)
-dnl Check if we have libmal source in extra/src
+dnl Check if we have libmal source in lib/libmal
MAKE_HAVE_LIBMAL=
case "$MAKE_PISOCKLIB" in
'') ;;
*)
- AC_MSG_CHECKING(for libmal in extra/src)
- if test ! -d $srcdir/extra/src/libmal
+ AC_MSG_CHECKING(for libmal in lib)
+ if test ! -d $srcdir/lib/libmal
then AC_MSG_RESULT(not found - no MAL synch for PalmOS)
- elif test -f $srcdir/extra/src/libmal/Makefile.in \
+ elif test -f $srcdir/lib/libmal/Makefile.in \
-a "$SOURCEDIR" != "$BUILDDIR"
then AC_MSG_RESULT(old-style libmal not supported in separate build tree)
@@ -1249,6 +1249,6 @@
dnl --------------------------------------------------------------------------
-dnl set the extra include and lib directories
-CPPFLAGS="-I$SOURCEDIR/include $CPPFLAGS -I$SOURCEDIR/extra/include"
+dnl set up the include directories
+CPPFLAGS="-I$SOURCEDIR/include $CPPFLAGS"
case "$BUILDDIR" in "$SOURCEDIR") ;; *)
CPPFLAGS="-I$BUILDDIR/include $CPPFLAGS" ;;
@@ -1267,11 +1267,11 @@
AC_SUBST(RESFLAGS)
-dnl add all extra/src directories to the search paths
+dnl add 3rd party libraries directories to the search paths
dnl c-client
-CPPFLAGS="$CPPFLAGS -I$BUILDDIR/extra/src/c-client"
-LIBS="$BUILDDIR/extra/src/c-client/c-client.a $LIBS"
+CPPFLAGS="$CPPFLAGS -I$BUILDDIR/lib/imap/c-client"
+LIBS="$BUILDDIR/lib/imap/c-client/c-client.a $LIBS"
dnl compface
-CPPFLAGS="$CPPFLAGS -I$SOURCEDIR/extra/src/compface -I$SOURCEDIR/src/wx/vcard"
-LIBS="$LIBS -L$BUILDDIR/extra/src/compface -lMcompface"
+CPPFLAGS="$CPPFLAGS -I$SOURCEDIR/lib/compface -I$SOURCEDIR/src/wx/vcard"
+LIBS="$BUILDDIR/lib/compface/libcompface.a $LIBS"
dnl --------------------------------------------------------------------------
@@ -1385,21 +1385,31 @@
AC_SUBST(CXXFLAGS_RELAXED)
+# gather all directories where we want to create .src links in DIR and all
+# Makefiles in COPY
OUTPUT="makeopts"
COPY=Makefile
DIR=
-for dir in `cd $srcdir; find include extra src locale doc res -type d -print`
-do case "$dir" in
- CVS | */CVS) continue ;;
- extra/src) DIR="$DIR $dir" ;; # no Makefile in this dir
- extra/src/libmal) DIR="$DIR $dir"; continue ;;
- extra/src/libmal*) continue ;;
- esac
- if test -f $srcdir/$dir/Names.mk
- then
- DIR="$DIR $dir"
- elif test -f $srcdir/$dir/Makefile
- then COPY="$COPY $dir/Makefile"
- DIR="$DIR $dir"
+for dir in `cd $srcdir; find include lib extra src locale doc res -type d -print`; do
+ case "$dir" in
+ CVS | */CVS | \
+ lib/imap/* | \
+ extra/src/c-client | \
+ extra/src/compface | \
+ extra/src/imap* | \
+ extra/src/libmal*)
+ # ignore
+ ;;
+
+ *)
+ # normal case
+ if test -f $srcdir/$dir/Makefile.M; then
+ COPY="$COPY $dir/Makefile.M"
+ elif test -f $srcdir/$dir/Makefile; then
+ COPY="$COPY $dir/Makefile"
+ elif test ! -f $srcdir/$dir/Names.mk; then
+ continue
fi
+ DIR="$DIR $dir"
+ esac
done
# HACK for backward compatibility; clean it up when old libmal is dead
@@ -1441,5 +1451,5 @@
echo "linking $mf"
rm -f $mf
- ln -s .src/Makefile $mf
+ ln -s .src/`basename $mf` $mf
done
;;
@@ -1467,5 +1477,5 @@
echo " SSL support: ${ssl_option}"
echo " Modules support: ${m_cv_USE_MODULES}"
-echo " Embedded Python: ${PYTHON_VER-none}"
+echo " Embedded Python: ${PYTHON_VER:-none}"
if test "$USE_PYTHON" != 0 -a "$USE_SWIG" = 1; then
echo " with swig: ${SWIG}"
-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g.
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
