1 diff -Nur lcms-1.08.orig/samples/Makefile lcms-1.08/samples/Makefile
2 --- lcms-1.08.orig/samples/Makefile Fri Nov 16 16:54:28 2001
3 +++ lcms-1.08/samples/Makefile Wed Jun 26 21:11:22 2002
8 +CFLAGS = $(OPTFLAGS) -Wall
12 icctrans: icctrans.c xgetopt.c
13 - $(CC) $(CFLAGS) icctrans.c xgetopt.c ../src/liblcms.a -I../include -o icctrans -lm
14 + $(CC) $(CFLAGS) icctrans.c xgetopt.c $(LDFLAGS) -L../src -L../src/.libs -llcms -I../include -o icctrans -lm
17 - $(CC) $(CFLAGS) wtpt.c ../src/liblcms.a -I../include -o wtpt -lm
18 + $(CC) $(CFLAGS) wtpt.c $(LDFLAGS) -L../src -L../src/.libs -llcms -I../include -o wtpt -lm
22 diff -Nur lcms-1.08.orig/src/Makefile lcms-1.08/src/Makefile
23 --- lcms-1.08.orig/src/Makefile Wed Nov 28 19:45:03 2001
24 +++ lcms-1.08/src/Makefile Wed Jun 26 21:15:55 2002
28 -CFLAGS = -g -O4 -I../include -fomit-frame-pointer -Wall
29 +CFLAGS = $(OPTFLAGS) -I../include -Wall
30 BASEDIR = $(DESTDIR)/usr
31 BINDIR = $(BASEDIR)/bin
32 LIBDIR = $(BASEDIR)/lib
33 INCDIR = $(BASEDIR)/include
41 - $(CC) $(CFLAGS) $(LDFLAGS) -c $<
43 + $(LIBTOOL) $(CC) $(CFLAGS) -c $<
45 SRCS = cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \
46 cmslut.c cmsmatsh.c cmsmtrx.c cmspack.c cmspcs.c cmswtpnt.c \
47 cmsxform.c cmssamp.c cmscam97.c
50 +OBJS = $(SRCS:.c=.lo)
54 -all: liblcms.a liblcms.so.${VERSION}
63 - $(AR) liblcms.a $(OBJS)
66 -liblcms.so.${VERSION}: $(OBJS)
67 - -$(CC) $(CFLAGS) $(LDFLAGS) -shared -o liblcms.so.${VERSION} $(OBJS)
68 - -ln -s liblcms.so.${VERSION} liblcms.so.1
69 - -ln -s liblcms.so.1 liblcms.so
71 + $(LIBTOOL) $(CC) -o liblcms.la $(OBJS) $(LDFLAGS) -rpath $(LIBDIR) -version-info $(VINFO) -lm
77 -install: liblcms.a liblcms.so.${VERSION}
79 mkdir -p $(BINDIR) $(LIBDIR) $(INCDIR)
80 - -cp -a liblcms.so* $(LIBDIR)
81 - cp -a liblcms.a $(LIBDIR)
82 + $(LIBTOOL) install liblcms.la $(LIBDIR)
83 cp ../include/lcms.h ../include/icc34.h $(INCDIR)
90 - -rm $(OBJS) liblcms.a liblcms.so.${VERSION} liblcms.so.1 liblcms.so
91 + -rm -rf $(OBJS) liblcms* .libs
92 diff -Nur lcms-1.08.orig/testbed/Makefile lcms-1.08/testbed/Makefile
93 --- lcms-1.08.orig/testbed/Makefile Tue Nov 13 21:54:50 2001
94 +++ lcms-1.08/testbed/Makefile Wed Jun 26 21:16:29 2002
98 -CFLAGS = -g -O4 -fomit-frame-pointer -Wall -I../include
99 +CFLAGS = $(OPTFLAGS) -Wall -I../include
103 -testcms: testcms.o ../src/liblcms.a
104 - $(CC) $(CFLAGS) testcms.o ../src/liblcms.a -o $@ -lm
105 +testcms: testcms.o ../src/liblcms.la
106 + $(CC) $(CFLAGS) testcms.o $(LDFLAGS) -L../src -L../src/.libs -llcms -o $@ -lm
112 + LD_LIBRARY_PATH=../src/.libs ./testcms
116 diff -Nur lcms-1.08.orig/tifficc/Makefile lcms-1.08/tifficc/Makefile
117 --- lcms-1.08.orig/tifficc/Makefile Fri Nov 16 16:54:58 2001
118 +++ lcms-1.08/tifficc/Makefile Wed Jun 26 21:17:14 2002
122 -CFLAGS = -g -O4 -fomit-frame-pointer -Wall -I../include -I/usr/include -I/usr/local/include
123 +CFLAGS = $(OPTFLAGS) -Wall -I../include
127 tifficc: tifficc.o getopt.o
128 - $(CC) $(CFLAGS) tifficc.o getopt.o ../src/liblcms.a -o $@ -lm -ljpeg -ltiff -lz
129 + $(CC) $(CFLAGS) tifficc.o getopt.o $(LDFLAGS) -L../src -L../src/.libs -llcms -o $@ -lm -ljpeg -ltiff -lz