$NetBSD: patch-ad,v 1.1.1.1 2002/12/31 06:59:54 dsainty Exp $

Use the libjpeg package, instead of a local copy, and pass through the skins
directory.

--- BuildUnix/Makefile.in.orig	Sat Mar 30 01:11:21 2002
+++ BuildUnix/Makefile.in	Sun Nov 24 02:24:49 2002
@@ -70,6 +70,7 @@
 GLLIB = @GLLIB@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
+PACKAGE_SKINS_FLAGS = -DPACKAGE_SKINS_DIR="\"@PACKAGE_SKINS_DIR@\""
 POSER_CFLAGS = @POSER_CFLAGS@
 POSER_CXXFLAGS = @POSER_CXXFLAGS@
 RANLIB = @RANLIB@
@@ -78,16 +79,16 @@
 THREAD_SRC = @THREAD_SRC@
 VERSION = @VERSION@
 
-SUBDIRS = Gzip jpeg espws-2.0
+SUBDIRS = Gzip espws-2.0
 
 SUFFIXES = .cpp
 
 VPATH = $(srcdir)/../SrcUnix:										$(srcdir)/../SrcShared:										$(srcdir)/../SrcShared/Hardware:							$(srcdir)/../SrcShared/Hardware/TRG:						$(srcdir)/../SrcShared/omnithread:							$(srcdir)/../SrcShared/Palm/Platform/Core/System/Src:						$(srcdir)/../SrcShared/Patches:								$(srcdir)/../SrcShared/UAE:
 
 
-CFLAGS = $(POSER_CFLAGS) $(LOCAL_CFLAGS) $(FLAGS) $(THREAD_FLAGS) $(X_CFLAGS)
-CXXFLAGS = $(POSER_CXXFLAGS) $(LOCAL_CFLAGS) $(FLAGS) $(THREAD_FLAGS) $(X_CFLAGS)
-INCLUDES = -I$(srcdir)/../SrcShared -I$(srcdir)/../SrcShared/Hardware -I$(srcdir)/../SrcShared/Hardware/TRG -I$(srcdir)/../SrcShared/Palm/Device -I$(srcdir)/../SrcShared/Palm/Platform -I$(srcdir)/../SrcShared/Palm/Platform/Core/Hardware/IncsPrv -I$(srcdir)/../SrcShared/Palm/Platform/Core/System/IncsPrv -I$(srcdir)/../SrcShared/Palm/Platform/Incs -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Core -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Core/Hardware -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Core/System -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Core/UI -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Libraries -I$(srcdir)/../SrcShared/Gzip -I$(srcdir)/../SrcShared/jpeg -I$(srcdir)/../SrcShared/omnithread -I$(srcdir)/../SrcShared/Patches -I$(srcdir)/../SrcShared/UAE -I$(srcdir)/../SrcUnix -I$(srcdir)/../SrcUnix/espws-2.0
+CFLAGS = $(POSER_CFLAGS) $(LOCAL_CFLAGS) $(FLAGS) $(THREAD_FLAGS) $(PACKAGE_SKINS_FLAGS) $(X_CFLAGS)
+CXXFLAGS = $(POSER_CXXFLAGS) $(LOCAL_CFLAGS) $(FLAGS) $(THREAD_FLAGS) $(PACKAGE_SKINS_FLAGS) $(X_CFLAGS)
+INCLUDES = -I$(srcdir)/../SrcShared -I$(srcdir)/../SrcShared/Hardware -I$(srcdir)/../SrcShared/Hardware/TRG -I$(srcdir)/../SrcShared/Palm/Device -I$(srcdir)/../SrcShared/Palm/Platform -I$(srcdir)/../SrcShared/Palm/Platform/Core/Hardware/IncsPrv -I$(srcdir)/../SrcShared/Palm/Platform/Core/System/IncsPrv -I$(srcdir)/../SrcShared/Palm/Platform/Incs -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Core -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Core/Hardware -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Core/System -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Core/UI -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Libraries -I$(srcdir)/../SrcShared/Gzip -I$(srcdir)/../SrcShared/omnithread -I$(srcdir)/../SrcShared/Patches -I$(srcdir)/../SrcShared/UAE -I$(srcdir)/../SrcUnix -I$(srcdir)/../SrcUnix/espws-2.0
 
 SRC_UNIX = EmApplicationFltk.cpp								EmApplicationFltk.h									EmCommonUnix.h										EmDirRefUnix.cpp									EmDirRefUnix.h										EmDlgFltk.cpp										EmDlgFltk.h											EmDocumentUnix.cpp									EmDocumentUnix.h									EmFileRefUnix.cpp									EmFileRefUnix.h										EmMenusFltk.cpp										EmMenusFltk.h										EmPixMapUnix.cpp									EmPixMapUnix.h										EmTransportSerialUnix.cpp							EmTransportSerialUnix.h								EmTransportUSBUnix.cpp								EmTransportUSBUnix.h								EmWindowFltk.cpp									EmWindowFltk.h										Platform_Unix.cpp									jconfig.h
 
@@ -115,7 +116,7 @@
 @SOLARIS_FALSE@SRC_THREAD = posix.cpp
 
 bin_PROGRAMS = pose
-pose_LDADD = $(srcdir)/Gzip/libposergzip.a $(srcdir)/jpeg/libposerjpeg.a $(srcdir)/espws-2.0/libposerespws.a -lfltk -L/usr/local/lib $(X_LIBS) -lXext -lX11 $(THREAD_LIBS) $(GLLIB) -lm
+pose_LDADD = $(srcdir)/Gzip/libposergzip.a $(srcdir)/espws-2.0/libposerespws.a -lfltk -ljpeg $(X_LIBS) -lXext -lX11 $(THREAD_LIBS) $(GLLIB) -lm
 pose_SOURCES = $(SRC_UNIX) $(SRC_UNIX_GEN) $(SRC_SHARED) $(SRC_SHARED_HARDWARE) $(SRC_PATCHES) $(SRC_TRG) $(SRC_UAE) $(SRC_PALM) $(SRC_THREAD)
 CLEANFILES = ResStrings.cpp EmDlgFltkFactory.h EmDlgFltkFactory.cpp config.cache config.log
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -222,7 +223,7 @@
 @SOLARIS_FALSE@EmTRGSD.o cpudefs.o cpuemu.o cpustbl.o readcpu.o Crc.o \
 @SOLARIS_FALSE@posix.o
 pose_DEPENDENCIES =  $(srcdir)/Gzip/libposergzip.a \
-$(srcdir)/jpeg/libposerjpeg.a $(srcdir)/espws-2.0/libposerespws.a
+$(srcdir)/espws-2.0/libposerespws.a
 pose_LDFLAGS = 
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
