[libpst-commits] r84 - branches/experimental-0.5-autotools

Chris Halls halls at alioth.debian.org
Thu Jan 11 20:08:31 CET 2007 

Author: halls
Date: 2007-01-11 20:08:31 +0100 (Thu, 11 Jan 2007)
New Revision: 84

Added:
   branches/experimental-0.5-autotools/Makefile.am
   branches/experimental-0.5-autotools/autogen.sh
   branches/experimental-0.5-autotools/configure.ac
   branches/experimental-0.5-autotools/libpst.exports
   branches/experimental-0.5-autotools/libpst.pc.in
Removed:
   branches/experimental-0.5-autotools/Makefile
Modified:
   branches/experimental-0.5-autotools/
   branches/experimental-0.5-autotools/ChangeLog
Log:
* Move to autoconf/automake/libtool based infrastructure
* Generate libpst shared library


Index: branches/experimental-0.5-autotools/libpst.exports
===================================================================
--- branches/experimental-0.5-autotools/libpst.exports	(revision 0)
+++ branches/experimental-0.5-autotools/libpst.exports	(revision 84)
@@ -0,0 +1,17 @@
+pst_0.0.0 {
+  global:
+    pst_attach_to_file
+    pst_attach_to_file_base64
+    pst_attach_to_mem
+    pst_close
+    pst_fwrite
+    pst_getNextDptr
+    pst_getTopOfFolders
+    pst_load_extended_attributes
+    pst_load_index
+    pst_open
+    pst_stricmp
+    pst_strincmp
+  local:
+    *;
+};
Index: branches/experimental-0.5-autotools/configure.ac
===================================================================
--- branches/experimental-0.5-autotools/configure.ac	(revision 0)
+++ branches/experimental-0.5-autotools/configure.ac	(revision 84)
@@ -0,0 +1,44 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.60a)
+AC_INIT(libpst, 0.5.2.99, libpst-devel at lists.alioth.debian.org)
+AC_CONFIG_SRCDIR([libpst.h])
+AC_CONFIG_HEADER([config.h])
+AM_INIT_AUTOMAKE(foreign)
+
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_LN_S
+
+AM_PROG_LIBTOOL
+
+# Checks for libraries.
+
+# Checks for header files.
+AC_HEADER_DIRENT
+AC_HEADER_STDC
+AC_CHECK_HEADERS([fcntl.h limits.h netinet/in.h stdint.h stdlib.h string.h sys/param.h unistd.h wchar.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_HEADER_STDBOOL
+AC_TYPE_INT16_T
+AC_TYPE_INT32_T
+AC_TYPE_SIZE_T
+AC_STRUCT_TM
+AC_TYPE_UINT32_T
+
+# Checks for library functions.
+AC_FUNC_LSTAT
+AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
+AC_FUNC_MALLOC
+AC_FUNC_MKTIME
+AC_FUNC_REALLOC
+AC_FUNC_STRFTIME
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS([memmove memset strchr strerror strpbrk strrchr strstr strtol])
+
+AC_CONFIG_FILES([Makefile libpst.pc])
+AC_OUTPUT
Index: branches/experimental-0.5-autotools/autogen.sh
===================================================================
--- branches/experimental-0.5-autotools/autogen.sh	(revision 0)
+++ branches/experimental-0.5-autotools/autogen.sh	(revision 84)
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+echo Running aclocal
+aclocal
+echo Running autoheader
+autoheader
+echo Running autoconf
+autoconf
+echo Running automake
+automake

Property changes on: branches/experimental-0.5-autotools/autogen.sh
___________________________________________________________________
Name: svn:executable
   + *

Index: branches/experimental-0.5-autotools/ChangeLog
===================================================================
--- branches/experimental-0.5-autotools/ChangeLog	(revision 83)
+++ branches/experimental-0.5-autotools/ChangeLog	(revision 84)
@@ -1,3 +1,13 @@
+LibPST experimental makefile infrastructure branch
+==================================================
+
+	* Makefile infrastructure changes:
+	  * Create a shared library, libpst.so.0
+	  * Add support for pkg-config (libpst.pc)
+	  * Move to autoconf+automake+libtool based makefiles
+
+--
+
 LibPST svn snapshot
 ===============================
 
Index: branches/experimental-0.5-autotools/libpst.pc.in
===================================================================
--- branches/experimental-0.5-autotools/libpst.pc.in	(revision 0)
+++ branches/experimental-0.5-autotools/libpst.pc.in	(revision 84)
@@ -0,0 +1,15 @@
+# libpst pkg-config file
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libpst
+Description: libpst provides access to Outlook personal folders (.PST) files
+Version: @VERSION@
+Requires: 
+Conflicts:
+Libs: 
+Cflags: -I${includedir}
+
Index: branches/experimental-0.5-autotools/Makefile.am
===================================================================
--- branches/experimental-0.5-autotools/Makefile.am	(revision 0)
+++ branches/experimental-0.5-autotools/Makefile.am	(revision 84)
@@ -0,0 +1,56 @@
+## Process this file with automake to produce Makefile.in
+
+AM_CFLAGS = -DVERSION=\"@VERSION@\"
+
+## Library packaging
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libpst.pc
+
+lib_LTLIBRARIES = libpst.la
+
+includedir = $(prefix)/include/libpst
+
+include_HEADERS = libpst.h timeconv.h libstrfunc.h 
+
+libpst_la_SOURCES = libpst.c timeconv.c libstrfunc.c debug.c lzfu.c
+libpst_la_LDFLAGS = -no-undefined -version-info 0:0:0 -version-script libpst.exports
+
+## Binaries
+
+bin_PROGRAMS = readpst readpstlog lspst
+
+readpst_SOURCES = readpst.c
+readpst_LDADD = libpst.la
+
+readpstlog_SOURCES = readpstlog.c
+readpstlog_LDADD = libpst.la
+
+lspst_SOURCES = lspst.c
+lspst_LDADD = libpst.la
+
+## Other binaries
+
+EXTRA_PROGRAMS = dumpblocks getidblock testdebug
+
+dumpblocks_SOURCES = dumpblocks.c
+dumpblocks_LDADD = libpst.la
+
+getidblock_SOURCES = getidblock.c
+getidblock_LDADD = libpst.la
+
+testdebug_SOURCES = testdebug.c
+testdebug_LDADD = libpst.la
+
+## Documentation
+
+doc_DATA = AUTHORS ChangeLog CREDITS FILE-FORMAT FILE-FORMAT.html INSTALL \
+        LICENSE TODO VERSION
+
+man_MANS = readpst.1 readpstlog.1
+
+## Other files
+
+EXTRA_DIST = XGetopt.c XGetopt.h common.h lzfu.h \
+             setup1.vdproj moz-script readlog.vcproj w32pst.sln w32pst.vcproj
+
Index: branches/experimental-0.5-autotools/Makefile
===================================================================
--- branches/experimental-0.5-autotools/Makefile	(revision 83)
+++ branches/experimental-0.5-autotools/Makefile	(revision 84)
@@ -1,80 +0,0 @@
-#!/usr/bin/make -f
-
-CFLAGS  ?= -g -O2 -Wall
-PREFIX ?= /usr/local
-INSTALL ?= install
-
-#---------------- Do not modify below this point ------------------
-
-INSTALL_DIR     := $(INSTALL) -p -d -o root -g root -m 0755
-INSTALL_FILE    := $(INSTALL) -p    -o root -g root -m 0644
-INSTALL_PROGRAM := $(INSTALL) -p    -o root -g root -m 0755 # -s
-INSTALL_SCRIPT  := $(INSTALL) -p    -o root -g root -m 0755
-
-VERSION = $(shell cat VERSION)
-CFLAGS += -DVERSION=\"$(VERSION)\"
-
-DOCS := AUTHORS ChangeLog CREDITS FILE-FORMAT FILE-FORMAT.html INSTALL \
-	LICENSE TODO VERSION
-
-DISTFILES := $(DOCS) Makefile setup1.vdproj XGetopt.c XGetopt.h common.h \
-	debug.c define.h dumpblocks.c getidblock.c libpst.c libpst.h \
-	libstrfunc.c libstrfunc.h lspst.c lzfu.c lzfu.h moz-script \
-	readlog.vcproj readpst.1 readpst.c readpstlog.1 readpstlog.c \
-	testdebug.c timeconv.c timeconv.h w32pst.sln w32pst.vcproj
-
-PROGS := lspst readpst readpstlog
-ALL_PROGS := $(PROGS) dumpblocks getidblock testdebug
-
-all: $(PROGS)
-
-XGetopt.o: XGetopt.h
-debug.o: define.h
-dumpblocks.o: define.h
-getidblock.o: XGetopt.h define.h libpst.h
-libpst.o: define.h libstrfunc.h libpst.h timeconv.h
-libstrfunc.o: libstrfunc.h
-lspst.o: libpst.h timeconv.h
-lzfu.o: define.h libpst.h lzfu.h
-readpst.o: XGetopt.h libstrfunc.h define.h libpst.h common.h timeconv.h lzfu.h
-readpstlog.o: XGetopt.h define.h
-testdebug.o: define.h
-timeconv.o: timeconv.h common.h
-
-readpst: readpst.o libpst.o timeconv.o libstrfunc.o debug.o lzfu.o
-lspst: debug.o libpst.o libstrfunc.o lspst.o timeconv.o
-getidblock: getidblock.o libpst.o debug.o libstrfunc.o
-testdebug: testdebug.o debug.o
-readpstlog: readpstlog.o debug.o
-dumpblocks: dumpblocks.o libpst.o debug.o libstrfunc.o
-
-clean: 
-	rm -f core *.o readpst.log $(ALL_PROGS) *~ MANIFEST
-
-distclean: clean
-	rm -f libpst-*.tar.gz
-
-install: all
-	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/bin
-	$(INSTALL_PROGRAM) readpst{,log} $(DESTDIR)$(PREFIX)/bin
-	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1
-	$(INSTALL_FILE) readpst{,log}.1 $(DESTDIR)$(PREFIX)/share/man/man1/
-	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/doc/libpst
-	$(INSTALL_FILE) $(DOCS) $(DESTDIR)$(PREFIX)/share/doc/libpst/
-
-uninstall:
-	-rm -f $(DESTDIR)$(PREFIX)/bin/readpst{,log}
-	-rm -f $(DESTDIR)$(PREFIX)/share/man/man1/readpst{,log}.1
-	-rm -f $(DESTDIR)$(PREFIX)/share/doc/libpst/
-
-# stolen from ESR's Software Release Practices HOWTO available at:
-# http://en.tldp.org/HOWTO/Software-Release-Practice-HOWTO/distpractice.html
-MANIFEST: Makefile
-	@ls $(DISTFILES) | sed s:^:libpst-$(VERSION)/: >MANIFEST
-tarball libpst-$(VERSION).tar.gz: MANIFEST $(DISTFILES)
-	@(cd ..; ln -s libpst libpst-$(VERSION))
-	(cd ..; tar -czvf libpst/libpst-$(VERSION).tar.gz `cat libpst/MANIFEST`)
-	@(cd ..; rm libpst-$(VERSION))
-	@rm -f MANIFEST
-
-.PHONY: clean distclean uninstall install tarball

Property changes on: branches/experimental-0.5-autotools
___________________________________________________________________
Name: svn:ignore
   - tags

   + tags
Makefile.in
depcomp
config.h
ltmain.sh
.deps
config.status
config.h.in
libtool
readpstlog
lspst
configure
config.log
config.guess
config.sub
.libs
stamp-h1
libpst.pc
readpst
autom4te.cache
missing
aclocal.m4
install-sh

More information about the libpst-commits mailing list