From 8449c783969cae2c4d4197feb75bf4d08bba8de2 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sat, 25 Nov 2006 20:06:18 +0000 Subject: [PATCH] Fixing build of the printing package for BONE and hopefully R5 too. Now printing to that old HP LaserJet 2100 over an even older LPR print server from R5 with the PCL5 driver and LPR transport... git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19374 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/print/drivers/shared/libprint/Jamfile | 2 ++ src/add-ons/print/shared/Jamfile | 2 ++ src/add-ons/print/transports/ipp/IppContent.cpp | 2 +- src/add-ons/print/transports/ipp/IppURLConnection.cpp | 2 +- src/add-ons/print/transports/lpr/LpsClient.cpp | 3 +-- src/add-ons/print/transports/shared/Jamfile | 4 ++-- src/add-ons/print/transports/shared/Socket.cpp | 2 +- src/add-ons/print/transports/shared/SocketStream.cpp | 2 +- src/libs/pdflib/libs/flate/Jamfile | 2 ++ src/libs/pdflib/libs/pdcore/Jamfile | 2 ++ src/libs/pdflib/libs/pdflib/Jamfile | 2 ++ src/libs/pdflib/libs/png/Jamfile | 2 ++ src/libs/pdflib/libs/tiff/Jamfile | 2 ++ src/preferences/print/Jamfile | 2 +- src/servers/print/shared/Jamfile | 2 ++ 15 files changed, 24 insertions(+), 9 deletions(-) diff --git a/src/add-ons/print/drivers/shared/libprint/Jamfile b/src/add-ons/print/drivers/shared/libprint/Jamfile index fe635c4f41..2912145e47 100644 --- a/src/add-ons/print/drivers/shared/libprint/Jamfile +++ b/src/add-ons/print/drivers/shared/libprint/Jamfile @@ -1,5 +1,7 @@ SubDir HAIKU_TOP src add-ons print drivers shared libprint ; +SetSubDirSupportedPlatformsBeOSCompatible ; + SubDirHdrs [ FDirName $(HAIKU_TOP) headers private print libprint ] ; # for BeUtils.h diff --git a/src/add-ons/print/shared/Jamfile b/src/add-ons/print/shared/Jamfile index a16ce0dd85..5928d55c0e 100644 --- a/src/add-ons/print/shared/Jamfile +++ b/src/add-ons/print/shared/Jamfile @@ -1,5 +1,7 @@ SubDir HAIKU_TOP src add-ons print shared ; +SetSubDirSupportedPlatformsBeOSCompatible ; + UsePrivateHeaders interface print ; StaticLibrary diff --git a/src/add-ons/print/transports/ipp/IppContent.cpp b/src/add-ons/print/transports/ipp/IppContent.cpp index dbec2115e7..8f368b3573 100644 --- a/src/add-ons/print/transports/ipp/IppContent.cpp +++ b/src/add-ons/print/transports/ipp/IppContent.cpp @@ -1,7 +1,7 @@ // Sun, 18 Jun 2000 // Y.Takagi -#if defined(__HAIKU__) +#if defined(__HAIKU__) || defined(HAIKU_TARGET_PLATFORM_BONE) # include # include #else diff --git a/src/add-ons/print/transports/ipp/IppURLConnection.cpp b/src/add-ons/print/transports/ipp/IppURLConnection.cpp index 2bcde63a88..d2516620ab 100644 --- a/src/add-ons/print/transports/ipp/IppURLConnection.cpp +++ b/src/add-ons/print/transports/ipp/IppURLConnection.cpp @@ -1,7 +1,7 @@ // Sun, 18 Jun 2000 // Y.Takagi -#ifdef __HAIKU__ +#if defined(__HAIKU__) || defined(HAIKU_TARGET_PLATFORM_BONE) # include #else # include diff --git a/src/add-ons/print/transports/lpr/LpsClient.cpp b/src/add-ons/print/transports/lpr/LpsClient.cpp index 526853c46d..514488718b 100644 --- a/src/add-ons/print/transports/lpr/LpsClient.cpp +++ b/src/add-ons/print/transports/lpr/LpsClient.cpp @@ -1,7 +1,7 @@ // Sun, 18 Jun 2000 // Y.Takagi -#ifdef __HAIKU__ +#if defined(__HAIKU__) || defined(HAIKU_TARGET_PLATFORM_BONE) # include # include #else @@ -9,7 +9,6 @@ # include #endif #include -#include #include #include diff --git a/src/add-ons/print/transports/shared/Jamfile b/src/add-ons/print/transports/shared/Jamfile index 7d784fe981..59da459c8c 100644 --- a/src/add-ons/print/transports/shared/Jamfile +++ b/src/add-ons/print/transports/shared/Jamfile @@ -1,5 +1,7 @@ SubDir HAIKU_TOP src add-ons print transports shared ; +SetSubDirSupportedPlatformsBeOSCompatible ; + if $(BONE_COMPATIBLE) { ObjectC++Flags Socket.cpp : -DHAVE_ARPA_INET -Dclosesocket=close ; } else { @@ -11,5 +13,3 @@ Objects Socket.cpp SocketStream.cpp ; - - diff --git a/src/add-ons/print/transports/shared/Socket.cpp b/src/add-ons/print/transports/shared/Socket.cpp index dbb2e93f22..3d0f4fbeeb 100644 --- a/src/add-ons/print/transports/shared/Socket.cpp +++ b/src/add-ons/print/transports/shared/Socket.cpp @@ -1,7 +1,7 @@ // Sun, 18 Jun 2000 // Y.Takagi -#ifdef __HAIKU__ +#if defined(__HAIKU__) || defined(HAIKU_TARGET_PLATFORM_BONE) # include #else # include diff --git a/src/add-ons/print/transports/shared/SocketStream.cpp b/src/add-ons/print/transports/shared/SocketStream.cpp index f1de8dd879..d1a4a51fc7 100644 --- a/src/add-ons/print/transports/shared/SocketStream.cpp +++ b/src/add-ons/print/transports/shared/SocketStream.cpp @@ -1,7 +1,7 @@ // Sun, 18 Jun 2000 // Y.Takagi -#ifdef __HAIKU__ +#if defined(__HAIKU__) || defined(HAIKU_TARGET_PLATFORM_BONE) # include #else # include diff --git a/src/libs/pdflib/libs/flate/Jamfile b/src/libs/pdflib/libs/flate/Jamfile index bc76676f21..da9a5fa1a4 100644 --- a/src/libs/pdflib/libs/flate/Jamfile +++ b/src/libs/pdflib/libs/flate/Jamfile @@ -1,5 +1,7 @@ SubDir HAIKU_TOP src libs pdflib libs flate ; +SetSubDirSupportedPlatformsBeOSCompatible ; + SubDirHdrs [ FDirName $(HAIKU_TOP) src libs pdflib libs pdcore ] ; UseLibraryHeaders pdflib ; diff --git a/src/libs/pdflib/libs/pdcore/Jamfile b/src/libs/pdflib/libs/pdcore/Jamfile index 806a6fa30a..47df40dea2 100644 --- a/src/libs/pdflib/libs/pdcore/Jamfile +++ b/src/libs/pdflib/libs/pdcore/Jamfile @@ -1,5 +1,7 @@ SubDir HAIKU_TOP src libs pdflib libs pdcore ; +SetSubDirSupportedPlatformsBeOSCompatible ; + UseLibraryHeaders pdflib ; SubDirHdrs [ FDirName $(HAIKU_TOP) src libs pdflib libs flate ] ; diff --git a/src/libs/pdflib/libs/pdflib/Jamfile b/src/libs/pdflib/libs/pdflib/Jamfile index 99873e7734..dd78cfc9f1 100644 --- a/src/libs/pdflib/libs/pdflib/Jamfile +++ b/src/libs/pdflib/libs/pdflib/Jamfile @@ -1,5 +1,7 @@ SubDir HAIKU_TOP src libs pdflib libs pdflib ; +SetSubDirSupportedPlatformsBeOSCompatible ; + SubDirHdrs [ FDirName $(HAIKU_TOP) src libs pdflib libs pdcore ] ; SubDirHdrs [ FDirName $(HAIKU_TOP) src libs pdflib libs flate ] ; SubDirHdrs [ FDirName $(HAIKU_TOP) src libs pdflib libs png ] ; diff --git a/src/libs/pdflib/libs/png/Jamfile b/src/libs/pdflib/libs/png/Jamfile index 077f9c7928..64a23bb71f 100644 --- a/src/libs/pdflib/libs/png/Jamfile +++ b/src/libs/pdflib/libs/png/Jamfile @@ -1,5 +1,7 @@ SubDir HAIKU_TOP src libs pdflib libs png ; +SetSubDirSupportedPlatformsBeOSCompatible ; + SubDirHdrs [ FDirName $(HAIKU_TOP) src libs pdflib libs flate ] ; SubDirHdrs [ FDirName $(HAIKU_TOP) src libs pdflib libs pdcore ] ; diff --git a/src/libs/pdflib/libs/tiff/Jamfile b/src/libs/pdflib/libs/tiff/Jamfile index a999e28baf..e68e277bd1 100644 --- a/src/libs/pdflib/libs/tiff/Jamfile +++ b/src/libs/pdflib/libs/tiff/Jamfile @@ -1,5 +1,7 @@ SubDir HAIKU_TOP src libs pdflib libs tiff ; +SetSubDirSupportedPlatformsBeOSCompatible ; + SubDirHdrs [ FDirName $(HAIKU_TOP) src libs pdflib libs pdcore ] ; SubDirHdrs [ FDirName $(HAIKU_TOP) src libs pdflib libs flate ] ; diff --git a/src/preferences/print/Jamfile b/src/preferences/print/Jamfile index 338f3eca35..44b0ac7d94 100644 --- a/src/preferences/print/Jamfile +++ b/src/preferences/print/Jamfile @@ -12,7 +12,7 @@ Preference Printers : JobListView.cpp SpoolFolder.cpp Globals.cpp - : libbe.so libtranslation.so libprint.a + : be translation libprint.a : Printers.rdef ; diff --git a/src/servers/print/shared/Jamfile b/src/servers/print/shared/Jamfile index 6aa6b0fadc..879acfe9ed 100644 --- a/src/servers/print/shared/Jamfile +++ b/src/servers/print/shared/Jamfile @@ -1,5 +1,7 @@ SubDir HAIKU_TOP src servers print shared ; +SetSubDirSupportedPlatformsBeOSCompatible ; + UsePrivateHeaders shared interface print ; StaticLibrary