23 files changed, 28 insertions, 16 deletions

diff --git a/Jamfile b/Jamfile
index c2c23740..58b6791a 100644
--- a/Jamfile
+++ b/Jamfile
@@ -244,37 +244,36 @@ Library libmupdf :
 
 if $(OS) = NT
 {
-	Main w32pdf : test/w32pdf.c ;
+	Main w32pdf : apps/w32pdf.c ;
 	LinkLibraries w32pdf : libmupdf libfitz ;
 	LINKLIBS on w32pdf$(SUFEXE) = -lgdi32 $(LINKLIBS) ;
 }
 
 if $(OS) = MACOSX
 {
-	Main carbonpdf : macpdf/carbonpdf.c macpdf/view.c ;
-	LinkLibraries carbonpdf : libmupdf libfitz ;
-	LINKLIBS on carbonpdf = -framework Carbon $(LINKLIBS) ;
-	File macpdf/carbonpdf.app/Contents/MacOS/carbonpdf : carbonpdf ;
-	MODE on macpdf/carbonpdf.app/Contents/MacOS/carbonpdf = 755 ;
+	MACPDF = apps/macpdf.app/Contents/MacOS/macpdf ;
+	Main $(MACPDF) : apps/macpdf.app/macpdf.c apps/macpdf.app/view.c ;
+	LinkLibraries $(MACPDF) : libmupdf libfitz ;
+	LINKLIBS on $(MACPDF) = -framework Carbon $(LINKLIBS) ;
 }
 
 if $(HAVE_X11)
 {
-	Main x11pdf : test/x11pdf.c test/ximage.c ;
+	Main x11pdf : apps/x11pdf.c apps/ximage.c ;
 	LinkLibraries x11pdf : libmupdf libfitz ;
 	LINKLIBS on x11pdf$(SUFEXE) = -lX11 -lXext $(LINKLIBS) ;
 }
 
 if $(HAVE_GTK)
 {
-	Main gtkpdf : test/gtkpdf.c ;
+	Main gtkpdf : apps/gtkpdf.c ;
 	LinkLibraries x11pdf : libmupdf libfitz ;
 	CCFLAGS += `pkg-config --cflags gtk+ gthread` ;
 	LINKLIBS on gtkpdf$(SUFEXE) = `pkg-config --libs gtk+ gmodule gthread` $(LINKLIBS) ;
 }
 
-Main pdfclean : test/pdfclean.c ;
-Main pdfdebug : test/pdfdebug.c ;
-Main pdfrip : test/pdfrip.c ;
+Main pdfclean : apps/pdfclean.c ;
+Main pdfdebug : apps/pdfdebug.c ;
+Main pdfrip : apps/pdfrip.c ;
 LinkLibraries pdfclean pdfdebug pdfrip : libmupdf libfitz ;
 
diff --git a/test/gtkpdf.c b/apps/gtkpdf.c
index 07730b38..07730b38 100644
--- a/test/gtkpdf.c
+++ b/apps/gtkpdf.c
diff --git a/macpdf/carbonpdf.app/Contents/Info.plist b/apps/macpdf.app/Contents/Info.plist
index 48d01207..71dd646b 100644
--- a/macpdf/carbonpdf.app/Contents/Info.plist
+++ b/apps/macpdf.app/Contents/Info.plist
@@ -5,9 +5,9 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>carbonpdf</string>
+	<string>macpdf</string>
 	<key>CFBundleIconFile</key>
-	<string>carbonpdf.icns</string>
+	<string>macpdf.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.artofcode.MuPDF</string>
 	<key>CFBundleInfoDictionaryVersion</key>
diff --git a/macpdf/carbonpdf.app/Contents/PkgInfo b/apps/macpdf.app/Contents/PkgInfo
index bd04210f..bd04210f 100644
--- a/macpdf/carbonpdf.app/Contents/PkgInfo
+++ b/apps/macpdf.app/Contents/PkgInfo
diff --git a/macpdf/carbonpdf.app/Contents/Resources/English.lproj/main.nib/classes.nib b/apps/macpdf.app/Contents/Resources/English.lproj/main.nib/classes.nib
index ea58db11..ea58db11 100644
--- a/macpdf/carbonpdf.app/Contents/Resources/English.lproj/main.nib/classes.nib
+++ b/apps/macpdf.app/Contents/Resources/English.lproj/main.nib/classes.nib
diff --git a/macpdf/carbonpdf.app/Contents/Resources/English.lproj/main.nib/info.nib b/apps/macpdf.app/Contents/Resources/English.lproj/main.nib/info.nib
index 8d83474f..8d83474f 100644
--- a/macpdf/carbonpdf.app/Contents/Resources/English.lproj/main.nib/info.nib
+++ b/apps/macpdf.app/Contents/Resources/English.lproj/main.nib/info.nib
diff --git a/macpdf/carbonpdf.app/Contents/Resources/English.lproj/main.nib/objects.xib b/apps/macpdf.app/Contents/Resources/English.lproj/main.nib/objects.xib
index 6e3aad82..6e3aad82 100644
--- a/macpdf/carbonpdf.app/Contents/Resources/English.lproj/main.nib/objects.xib
+++ b/apps/macpdf.app/Contents/Resources/English.lproj/main.nib/objects.xib
diff --git a/macpdf/carbonpdf.app/Contents/Resources/carbonpdf.icns b/apps/macpdf.app/Contents/Resources/macpdf.icns
index d11b8be1..d11b8be1 100644
--- a/macpdf/carbonpdf.app/Contents/Resources/carbonpdf.icns
+++ b/apps/macpdf.app/Contents/Resources/macpdf.icns
diff --git a/macpdf/carbonpdf.c b/apps/macpdf.app/macpdf.c
index e543e7c7..88ea3351 100644
--- a/macpdf/carbonpdf.c
+++ b/apps/macpdf.app/macpdf.c
@@ -1,4 +1,4 @@
-#include "carbonpdf.h"
+#include "macpdf.h"
 
 static void
 init_window(viewctx *ctx)
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
     err = CreateWindowFromNib(nibRef, CFSTR("MainWindow"), &window);
     require_noerr(err, CantCreateWindow);
 
-    openpdf(window, "/Users/raph/golf/fitz/tiger.pdf");
+    openpdf(window, "tiger.pdf");
 
     DisposeNibReference(nibRef);
 
diff --git a/macpdf/carbonpdf.h b/apps/macpdf.app/macpdf.h
index dde4dca7..dde4dca7 100644
--- a/macpdf/carbonpdf.h
+++ b/apps/macpdf.app/macpdf.h
diff --git a/macpdf/view.c b/apps/macpdf.app/view.c
index b44718aa..de780920 100644
--- a/macpdf/view.c
+++ b/apps/macpdf.app/view.c
@@ -1,7 +1,7 @@
 /* This module implements a Carbon HIView object for a pattern plate
    editor. */
 
-#include "carbonpdf.h"
+#include "macpdf.h"
 
 #define kViewClassID CFSTR("com.artofcode.mupdf.View")
 #define kViewPrivate 'MU_v'
diff --git a/test/pdfclean.c b/apps/pdfclean.c
index a55b94ef..a55b94ef 100644
--- a/test/pdfclean.c
+++ b/apps/pdfclean.c
diff --git a/test/pdfdebug.c b/apps/pdfdebug.c
index 2a18ade7..2a18ade7 100644
--- a/test/pdfdebug.c
+++ b/apps/pdfdebug.c
diff --git a/test/pdffunction.c b/apps/pdffunction.c
index 20dabf1e..20dabf1e 100644
--- a/test/pdffunction.c
+++ b/apps/pdffunction.c
diff --git a/test/pdfmerge.c b/apps/pdfmerge.c
index 3bb7c868..3bb7c868 100644
--- a/test/pdfmerge.c
+++ b/apps/pdfmerge.c
diff --git a/test/pdfrip.c b/apps/pdfrip.c
index b6d2b9d8..b6d2b9d8 100644
--- a/test/pdfrip.c
+++ b/apps/pdfrip.c
diff --git a/test/showcmap.c b/apps/showcmap.c
index 3e6e5e8e..3e6e5e8e 100644
--- a/test/showcmap.c
+++ b/apps/showcmap.c
diff --git a/test/w32pdf.c b/apps/w32pdf.c
index 33fb589c..33fb589c 100644
--- a/test/w32pdf.c
+++ b/apps/w32pdf.c
diff --git a/test/x11pdf.c b/apps/x11pdf.c
index e35f90a6..e35f90a6 100644
--- a/test/x11pdf.c
+++ b/apps/x11pdf.c
diff --git a/test/ximage.c b/apps/ximage.c
index 9f7ec064..9f7ec064 100644
--- a/test/ximage.c
+++ b/apps/ximage.c
diff --git a/util/strlcat.c b/util/strlcat.c
index 5f260abb..46edd434 100644
--- a/util/strlcat.c
+++ b/util/strlcat.c
@@ -4,6 +4,8 @@
  * Returns strlen(src); if retval >= siz, truncation occurred.
  */
 
+#ifdef NEED_STRLCAT
+
 #include <string.h>
 
 int strlcat(char *dst, const char *src, int siz)
@@ -32,3 +34,6 @@ int strlcat(char *dst, const char *src, int siz)
 
 	return dlen + (s - src);	/* count does not include NUL */
 }
+
+#endif
+
diff --git a/util/strlcpy.c b/util/strlcpy.c
index 73416ae1..72e45d6b 100644
--- a/util/strlcpy.c
+++ b/util/strlcpy.c
@@ -3,6 +3,8 @@
  * Returns strlen(src); if retval >= siz, truncation occurred.
  */
 
+#ifdef NEED_STRLCPY
+
 #include <string.h>
 
 int strlcpy(char *dst, const char *src, int siz)
@@ -30,3 +32,5 @@ int strlcpy(char *dst, const char *src, int siz)
 	return(s - src - 1);	/* count does not include NUL */
 }
 
+#endif
+
diff --git a/util/strsep.c b/util/strsep.c
index e54903ce..e3592c2a 100644
--- a/util/strsep.c
+++ b/util/strsep.c
@@ -1,3 +1,5 @@
+#ifdef NEED_STRSEP
+
 #include <string.h>
 
 char *strsep(char **stringp, const char *delim)
@@ -9,3 +11,5 @@ char *strsep(char **stringp, const char *delim)
 	return ret;
 }
 
+#endif
+