From 8473eaa54c090c1a303a9872e0a3e6424a9771e2 Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Wed, 11 Aug 2004 08:53:41 +0000 Subject: [PATCH] Linking against libprinttransportaddon.a don't include the mandatory init/exit_transport symbols as the add-on didn't explicitly reference them. Switch to simply link against PrintTransportAddOn.o instead. Rename multiple print_transport.cpp into add-on main class name. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8550 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/print/transports/parallel_port/Jamfile | 7 ++++--- src/add-ons/print/transports/serial_port/Jamfile | 7 ++++--- src/add-ons/print/transports/usb_port/Jamfile | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/add-ons/print/transports/parallel_port/Jamfile b/src/add-ons/print/transports/parallel_port/Jamfile index ef72b6e5bc..d9a436c939 100644 --- a/src/add-ons/print/transports/parallel_port/Jamfile +++ b/src/add-ons/print/transports/parallel_port/Jamfile @@ -1,14 +1,15 @@ SubDir OBOS_TOP src add-ons print transports parallel_port ; SubDirHdrs [ FDirName $(OBOS_TOP) src add-ons print transports shared ] ; - UsePrivateHeaders interface print ; Addon Parallel\ Port : Print transport : - print_transport.cpp + ParallelTransport.cpp + PrintTransportAddOn.o ; -LinkSharedOSLibs Parallel\ Port : be libprinttransportaddon.a ; +ObjectReferences PrintTransportAddOn.o ; +LinkSharedOSLibs Parallel\ Port : be ; Package haiku-printingkit-cvs : Parallel\ Port : diff --git a/src/add-ons/print/transports/serial_port/Jamfile b/src/add-ons/print/transports/serial_port/Jamfile index 4ea8de0c9f..cf49e27419 100644 --- a/src/add-ons/print/transports/serial_port/Jamfile +++ b/src/add-ons/print/transports/serial_port/Jamfile @@ -1,14 +1,15 @@ SubDir OBOS_TOP src add-ons print transports serial_port ; SubDirHdrs [ FDirName $(OBOS_TOP) src add-ons print transports shared ] ; - UsePrivateHeaders interface print ; Addon Serial\ Port : Print transport : - print_transport.cpp + SerialTransport.cpp + PrintTransportAddOn.o ; -LinkSharedOSLibs Serial\ Port : be libprinttransportaddon.a ; +ObjectReferences PrintTransportAddOn.o ; +LinkSharedOSLibs Serial\ Port : be ; Package haiku-printingkit-cvs : Serial\ Port : diff --git a/src/add-ons/print/transports/usb_port/Jamfile b/src/add-ons/print/transports/usb_port/Jamfile index e2919c2c7b..00aff93844 100644 --- a/src/add-ons/print/transports/usb_port/Jamfile +++ b/src/add-ons/print/transports/usb_port/Jamfile @@ -1,14 +1,15 @@ SubDir OBOS_TOP src add-ons print transports usb_port ; SubDirHdrs [ FDirName $(OBOS_TOP) src add-ons print transports shared ] ; - UsePrivateHeaders interface print ; Addon USB\ Port : Print transport : - print_transport.cpp + USBTransport.cpp + PrintTransportAddOn.o ; -LinkSharedOSLibs USB\ Port : be libprinttransportaddon.a ; +ObjectReferences PrintTransportAddOn.o ; +LinkSharedOSLibs USB\ Port : be ; Package haiku-printingkit-cvs : USB\ Port :