summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Jamfile16
-rw-r--r--apps/common/pdfapp.c (renamed from mupdf/pdfapp.c)0
2 files changed, 11 insertions, 5 deletions
diff --git a/Jamfile b/Jamfile
index c2a7bd45..6aa3b422 100644
--- a/Jamfile
+++ b/Jamfile
@@ -263,9 +263,15 @@ Library libmupdf :
pdf_resources.c
pdf_store.c
- # ahem. how did this get here?
- pdfapp.c
+ ;
+
+# --------------------------------------------------------------------------
+
+SubDir TOP apps common ;
+
+Library libpdfapp :
+ pdfapp.c
;
@@ -308,7 +314,7 @@ if $(OS) = MINGW
WINLIBS = -lgdi32 -lcomdlg32 ;
if $(BUILD) = release { WINLIBS += -mwindows ; }
- LinkLibraries ghostpdf : $(FITZLIBS) ;
+ LinkLibraries ghostpdf : libpdfapp $(FITZLIBS) ;
LINKLIBS on ghostpdf$(SUFEXE) = $(LINKLIBS) $(WINLIBS) ;
@@ -319,7 +325,7 @@ if $(HAVE_X11) = yes
{
SubDir TOP apps unix ;
Main ghostpdf : x11pdf.c ximage.c ;
- LinkLibraries ghostpdf : $(FITZLIBS) ;
+ LinkLibraries ghostpdf : libpdfapp $(FITZLIBS) ;
LINKLIBS on ghostpdf$(SUFEXE) = $(LINKLIBS) -lX11 -lXext ;
}
@@ -345,7 +351,7 @@ if $(OS) = MACOSX
MkDir $(ALL_LOCATE_TARGET)/$(MACPDF:D) ;
Depends $(MACPDF) : $(ALL_LOCATE_TARGET)/$(MACPDF:D) ;
Main $(MACPDF) : macpdf.c ;
- LinkLibraries $(MACPDF) : $(FITZLIBS) ;
+ LinkLibraries $(MACPDF) : libpdfapp $(FITZLIBS) ;
LINKLIBS on $(MACPDF) = $(LINKLIBS) -framework Carbon ;
}
diff --git a/mupdf/pdfapp.c b/apps/common/pdfapp.c
index 2b605faf..2b605faf 100644
--- a/mupdf/pdfapp.c
+++ b/apps/common/pdfapp.c