# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1233981484 28800
# Node ID 5e4d6faada34ff0b49e0c5b7e235844dab25d7da
# Parent  dd905e537728283b1fd57fdbbac70e88e64a20e0
fix from Fridrich Strba for parallel make

diff -r dd905e537728 -r 5e4d6faada34 Makefile.am
--- a/Makefile.am	Thu Feb 05 13:51:10 2009 -0800
+++ b/Makefile.am	Fri Feb 06 20:38:04 2009 -0800
@@ -1,4 +1,4 @@
-SUBDIRS = src man html info debian src/libpst
+SUBDIRS = src man html info debian
 htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@
 html_DATA = AUTHORS COPYING ChangeLog NEWS README
 CLEANFILES = xml/libpst xml/Makefile
diff -r dd905e537728 -r 5e4d6faada34 configure.in
--- a/configure.in	Thu Feb 05 13:51:10 2009 -0800
+++ b/configure.in	Fri Feb 06 20:38:04 2009 -0800
@@ -262,7 +262,6 @@
     libpst.spec             \
     man/Makefile            \
     src/Makefile            \
-    src/libpst/Makefile     \
     src/pst2dii.cpp         \
     xml/Makefile            \
     xml/libpst              \
diff -r dd905e537728 -r 5e4d6faada34 src/Makefile.am
--- a/src/Makefile.am	Thu Feb 05 13:51:10 2009 -0800
+++ b/src/Makefile.am	Fri Feb 06 20:38:04 2009 -0800
@@ -27,6 +27,7 @@
                 timeconv.c      \
                 vbuf.c
 
+
 if NEED_XGETOPT
     common_source += XGetopt.c
 	common_header += XGetopt.h
@@ -37,14 +38,14 @@
 if BUILD_DII
     bin_PROGRAMS   += pst2dii
 endif
-lspst_SOURCES       = lspst.c         $(common_header)
-readpst_SOURCES     = readpst.c       $(common_header)
-readpstlog_SOURCES  = readpstlog.c    $(common_header)
-pst2ldif_SOURCES    = pst2ldif.cpp    $(common_header)
-pst2dii_SOURCES     = pst2dii.cpp     $(common_header)
-deltasearch_SOURCES = deltasearch.cpp $(common_header)
-dumpblocks_SOURCES  = dumpblocks.c    $(common_header)
-getidblock_SOURCES  = getidblock.c    $(common_header)
+lspst_SOURCES       = lspst.c          $(common_header)
+readpst_SOURCES     = readpst.c        $(common_header)
+readpstlog_SOURCES  = readpstlog.c     $(common_header)
+pst2ldif_SOURCES    = pst2ldif.cpp     $(common_header)
+pst2dii_SOURCES     = pst2dii.cpp      $(common_header)
+deltasearch_SOURCES = deltasearch.cpp  $(common_header)
+dumpblocks_SOURCES  = dumpblocks.c     $(common_header)
+getidblock_SOURCES  = getidblock.c     $(common_header)
 
 lspst_CFLAGS        = $(AM_CFLAGS)
 readpst_CFLAGS      = $(AM_CFLAGS)
@@ -55,6 +56,15 @@
 dumpblocks_CFLAGS   = $(AM_CFLAGS)
 getidblock_CFLAGS   = $(AM_CFLAGS)
 
+lspst_DEPENDENCIES        = libpst.la
+readpst_DEPENDENCIES      = libpst.la
+readpstlog_DEPENDENCIES   = libpst.la
+pst2ldif_DEPENDENCIES     = libpst.la
+pst2dii_DEPENDENCIES      = libpst.la
+deltasearch_DEPENDENCIES  = libpst.la
+dumpblocks_DEPENDENCIES   = libpst.la
+getidblock_DEPENDENCIES   = libpst.la
+
 if STATIC_TOOLS
     noinst_LTLIBRARIES    = libpst.la
 else
@@ -90,3 +100,5 @@
 dumpblocks_LDADD  = $(all_libraries) $(PSTLIB) $(ICONVLIB)
 getidblock_LDADD  = $(all_libraries) $(PSTLIB) $(ICONVLIB)
 deltasearch_LDADD = $(all_libraries) $(PSTLIB) $(ICONVLIB)
+
+
diff -r dd905e537728 -r 5e4d6faada34 src/libpst.h
--- a/src/libpst.h	Thu Feb 05 13:51:10 2009 -0800
+++ b/src/libpst.h	Fri Feb 06 20:38:04 2009 -0800
@@ -10,7 +10,7 @@
 #ifndef LIBPST_H
 #define LIBPST_H
 
-#include <libpst/common.h>
+#include "common.h"
 
 
 // switch to maximal packing for all structures in the libpst interface
diff -r dd905e537728 -r 5e4d6faada34 src/libpst/Makefile.am
--- a/src/libpst/Makefile.am	Thu Feb 05 13:51:10 2009 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-EXTRA_DIST = common.h
diff -r dd905e537728 -r 5e4d6faada34 src/libpst/common.h
--- a/src/libpst/common.h	Thu Feb 05 13:51:10 2009 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-#include "../common.h"
diff -r dd905e537728 -r 5e4d6faada34 src/libstrfunc.h
--- a/src/libstrfunc.h	Thu Feb 05 13:51:10 2009 -0800
+++ b/src/libstrfunc.h	Fri Feb 06 20:38:04 2009 -0800
@@ -1,4 +1,4 @@
-
+#include "common.h"
 char * base64_encode(void *data, size_t size);
 char * base64_encode_multiple(void *data, size_t size, int *line_count);
 void hexdump(char *hbuf, int start, int stop, int ascii);
diff -r dd905e537728 -r 5e4d6faada34 src/timeconv.h
--- a/src/timeconv.h	Thu Feb 05 13:51:10 2009 -0800
+++ b/src/timeconv.h	Fri Feb 06 20:38:04 2009 -0800
@@ -1,15 +1,14 @@
 #ifndef __TIMECONV_H
 #define __TIMECONV_H
 
+#include "common.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
-  time_t fileTimeToUnixTime( const FILETIME *filetime, DWORD *remainder );
-
-  char * fileTimeToAscii (const FILETIME *filetime);
-
-  struct tm * fileTimeToStructTM (const FILETIME *filetime);
-
+    time_t fileTimeToUnixTime( const FILETIME *filetime, DWORD *remainder );
+    char * fileTimeToAscii (const FILETIME *filetime);
+    struct tm * fileTimeToStructTM (const FILETIME *filetime);
 #ifdef __cplusplus
 }
 #endif
diff -r dd905e537728 -r 5e4d6faada34 src/vbuf.h
--- a/src/vbuf.h	Thu Feb 05 13:51:10 2009 -0800
+++ b/src/vbuf.h	Fri Feb 06 20:38:04 2009 -0800
@@ -11,6 +11,9 @@
 
 #ifndef VBUF_H
 #define VBUF_H
+
+#include "common.h"
+
 #define SZ_MAX     4096
 /***************************************************/