[Spread-cvs] commit: r466 - in libspreadutil/trunk: . docs
jonathan at spread.org
jonathan at spread.org
Sun Jan 29 15:26:40 EST 2012
Author: jonathan
Date: 2012-01-29 15:26:40 -0500 (Sun, 29 Jan 2012)
New Revision: 466
Added:
libspreadutil/trunk/docs/
libspreadutil/trunk/docs/Makefile.in
libspreadutil/trunk/examples/
Modified:
libspreadutil/trunk/Makefile.in
libspreadutil/trunk/configure.in
Log:
Add docs and examples directories with Makefile.in for docs. Update configure.in with additional rules. Add basic install/uninstall rules.
Modified: libspreadutil/trunk/Makefile.in
===================================================================
--- libspreadutil/trunk/Makefile.in 2012-01-29 04:02:46 UTC (rev 465)
+++ libspreadutil/trunk/Makefile.in 2012-01-29 20:26:40 UTC (rev 466)
@@ -1,4 +1,6 @@
-SUBDIRS=src
+SUBDIRS=src examples
+INSTALLSUBDIRS=src docs examples
+BINSUBDIRS=src examples
all: $(SUBDIRS)
for dir in $(SUBDIRS); do \
@@ -22,3 +24,23 @@
veryclean: distclean
rm -f configure
+
+binrelease: $(BINSUBDIRS)
+ for dir in $(BINSUBDIRS); do \
+ ( $(MAKE) -C $$dir binrelease); \
+ done
+
+install: $(INSTALLSUBDIRS)
+ for dir in $(INSTALLSUBDIRS); do \
+ ( $(MAKE) -C $$dir install); \
+ done
+
+uninstallall: uninstall
+ for dir in $(INSTALLSUBDIRS); do \
+ ( $(MAKE) -C $$dir uninstallall); \
+ done
+
+uninstall:
+ for dir in $(INSTALLSUBDIRS); do \
+ ( $(MAKE) -C $$dir uninstall); \
+ done
Modified: libspreadutil/trunk/configure.in
===================================================================
--- libspreadutil/trunk/configure.in 2012-01-29 04:02:46 UTC (rev 465)
+++ libspreadutil/trunk/configure.in 2012-01-29 20:26:40 UTC (rev 466)
@@ -1,7 +1,7 @@
-AC_INIT(Spread_Util, 0.0.1)
+AC_INIT(Spread_Util, 0.9.0)
AC_CONFIG_AUX_DIR(buildtools)
-AC_CONFIG_HEADER(src/config.h)
+AC_CONFIG_HEADERS(src/config.h)
AC_CANONICAL_HOST
@@ -56,6 +56,22 @@
fi
]
)
+AC_ARG_WITH(ldflags,
+ [ --with-ldflags Specify additional flags to pass to linker],
+ [
+ if test "x$withval" != "xno" ; then
+ LDFLAGS="$LDFLAGS $withval"
+ fi
+ ]
+)
+AC_ARG_WITH(libs,
+ [ --with-libs Specify additional libraries to link with],
+ [
+ if test "x$withval" != "xno" ; then
+ LIBS="$LIBS $withval"
+ fi
+ ]
+)
# Checks for libraries.
OLDLDFLAGS=$LDFLAGS
@@ -92,6 +108,19 @@
dnl Checks for time functions
AC_CHECK_FUNCS(gettimeofday time)
+# Check for clock_gettime(CLOCK_MONOTONIC, ...)
+AC_CACHE_CHECK([for clock_gettime(CLOCK_MONOTONIC)], ac_cv_clock_gettime_monotonic, [
+ AC_TRY_COMPILE(
+ [ #include <time.h> ],
+ [ struct timespec t; clock_gettime(CLOCK_MONOTONIC, &t); ],
+ [ ac_cv_clock_gettime_monotonic="yes" ],
+ [ ac_cv_clock_gettime_monotonic="no" ]
+ )
+])
+if test "x$ac_cv_clock_gettime_monotonic" = "xyes" ; then
+ AC_DEFINE(HAVE_CLOCK_GETTIME_CLOCK_MONOTONIC, 1, [Have clock_gettime(CLOCK_MONOTONIC, ...)!])
+fi
+
# Check for broken snprintf
if test "x$ac_cv_func_snprintf" = "xyes" ; then
AC_MSG_CHECKING([whether snprintf correctly terminates long strings])
@@ -661,6 +690,19 @@
mips-sgi-irix*)
LIBSPSO=none
;;
+*-*-solaris*)
+ SHCC=$CC
+ SHCFLAGS="$CFLAGS -fPIC"
+ SHCPPFLAGS="$CPPFLAGS"
+ SHLD="$CC -shared"
+ SHLDFLAGS="$SHLDFLAGS $LDFLAGS"
+ SHLIBS=$LIBS
+ SHLDOPTION="-Wl,"
+ SHLDNAME="-h,"
+ SHLDCONVERTSTATIC="-Wl,-whole-archive"
+ SHLDCONVERTSTATICEND="-Wl,-no-whole-archive"
+ LIBSPSO="libspread-util.so"
+ ;;
*-*-*)
SHCC=$CC
SHCFLAGS="$CFLAGS -fPIC"
@@ -688,7 +730,7 @@
AC_SUBST(SHLDCONVERTSTATIC)
AC_SUBST(SHLDCONVERTSTATICEND)
-AC_OUTPUT(Makefile src/Makefile)
+AC_OUTPUT(Makefile src/Makefile docs/Makefile examples/Makefile)
# Print summary of options
Added: libspreadutil/trunk/docs/Makefile.in
===================================================================
--- libspreadutil/trunk/docs/Makefile.in (rev 0)
+++ libspreadutil/trunk/docs/Makefile.in 2012-01-29 20:26:40 UTC (rev 466)
@@ -0,0 +1,113 @@
+.SUFFIXES: .lo .to .tlo
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+sbindir=@sbindir@
+libdir=@libdir@
+includedir=@includedir@
+mandir=@mandir@
+mansubdir=@mansubdir@
+sysconfdir=@sysconfdir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+docdir=@docdir@
+piddir=@piddir@
+srcdir=@srcdir@
+top_srcdir=@top_srcdir@
+buildtoolsdir=$(top_srcdir)/buildtools
+
+DESTDIR=
+VPATH=@srcdir@
+
+PATHS=
+
+INSTALL=@INSTALL@
+SOFTLINK=@LN_S@
+PERL=@PERL@
+
+MANPAGES = E_get_time.3.out libspread-util.3.out
+MANPAGES_IN = E_get_time.3 libspread-util.3
+
+PAGENAMES = E_get_time
+
+# Misc documentation files in docs/ directory that should be installed
+DOCFILES =
+
+MANTYPE = @MANTYPE@
+
+
+all: $(MANPAGES)
+
+$(MANPAGES): $(MANPAGES_IN)
+ @if test "$(MANTYPE)" = "cat"; then \
+ manpage=$(srcdir)/`echo $@ | sed 's/\.[1-9]\.out$$/\.0/'`; \
+ else \
+ manpage=$(srcdir)/`echo $@ | sed 's/\.out$$//'`; \
+ fi; \
+ if test "$(MANTYPE)" = "man"; then \
+ $(FIXPATHSCMD) $${manpage} | $(PERL) $(buildtoolsdir)/mdoc2man.pl > $@; \
+ else \
+ $(FIXPATHSCMD) $${manpage} > $@; \
+ fi
+
+clean:
+ rm -f *.out
+
+distclean: clean
+ rm -f Makefile config.h config.status *~
+
+mrproper: distclean
+
+veryclean: distclean
+ rm -f configure
+
+catman-do:
+ @for f in $(MANPAGES_IN) ; do \
+ base=`echo $$f | sed 's/\..*$$//'` ; \
+ echo "$$f -> $$base.0" ; \
+ nroff -mandoc $$f | cat -v | sed -e 's/.\^H//g' \
+ >$$base.0 ; \
+ done
+
+distprep: catman-do
+ autoreconf
+
+install: install-files install-man
+
+install-man:
+ $(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(mandir)
+ $(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)3
+ $(INSTALL) -m 644 libspread-util.3.out $(DESTDIR)$(mandir)/$(mansubdir)3/libspread-util.3
+ for page in $(PAGENAMES); \
+ do \
+ $(INSTALL) -m 644 $$page.3.out $(DESTDIR)$(mandir)/$(mansubdir)3/$$page.3; \
+ done
+
+install-files:
+ $(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(docdir)
+ for docfile in $(DOCFILES); \
+ do \
+ $(INSTALL) -m 644 $(srcdir)/$$docfile $(DESTDIR)$(docdir)/$$docfile; \
+ done
+ $(INSTALL) -m 644 $(srcdir)/../Readme.txt $(DESTDIR)$(docdir)/Readme.txt;
+ $(INSTALL) -m 644 $(srcdir)/../license.txt $(DESTDIR)$(docdir)/license.txt;
+
+uninstallall: uninstall
+ -rmdir $(DESTDIR)$(sysconfdir)
+ -rmdir $(DESTDIR)$(docdir)
+ -rmdir $(DESTDIR)$(mandir)/$(mansubdir)3
+ -rmdir $(DESTDIR)$(mandir)
+
+uninstall:
+ for page in $(PAGENAMES); \
+ do \
+ -rm -f $(DESTDIR)$(mandir)/$(mansubdir)3/$$page.3; \
+ done
+ -rm -f $(DESTDIR)$(mandir)/$(mansubdir)3/libspread-util.3
+ for docfile in $(DOCFILES); \
+ do \
+ -rm -f $(DESTDIR)$(docdir)/$$docfile; \
+ done
+ -rm -f $(DESTDIR)$(docdir)/Readme.txt
+ -rm -f $(DESTDIR)$(docdir)/license.txt
More information about the Spread-cvs
mailing list