1 diff -Nur lcms-1.10/samples/Makefile lcms-1.10-makefiles/samples/Makefile
2 --- lcms-1.10/samples/Makefile 2003-03-01 15:42:35.000000000 +0100
3 +++ lcms-1.10-makefiles/samples/Makefile 2003-06-25 13:56:47.000000000 +0200
8 +CFLAGS = $(OPTFLAGS) -Wall
9 BASEDIR = $(DESTDIR)/usr
10 BINDIR = $(BASEDIR)/bin
13 all: icctrans wtpt icc2ps icclink
15 icctrans: icctrans.c xgetopt.c
16 - $(CC) $(CFLAGS) icctrans.c xgetopt.c ../src/liblcms.a -I../include -o icctrans -lm
17 + $(CC) $(CFLAGS) icctrans.c xgetopt.c $(LDFLAGS) -L../src -L../src/.libs -llcms -I../include -o icctrans -lm
20 - $(CC) $(CFLAGS) wtpt.c ../src/liblcms.a -I../include -o wtpt -lm
22 + $(CC) $(CFLAGS) wtpt.c $(LDFLAGS) -L../src -L../src/.libs -llcms -I../include -o wtpt -lm
24 icc2ps: icc2ps.c xgetopt.c
25 - $(CC) $(CFLAGS) icc2ps.c xgetopt.c ../src/liblcms.a -I../include -o icc2ps -lm
26 + $(CC) $(CFLAGS) icc2ps.c xgetopt.c $(LDFLAGS) -L../src -L../src/.libs -llcms -I../include -o icc2ps -lm
28 icclink: icclink.c xgetopt.c
29 - $(CC) $(CFLAGS) icclink.c xgetopt.c ../src/liblcms.a -I../include -o icclink -lm
30 + $(CC) $(CFLAGS) icclink.c xgetopt.c $(LDFLAGS) -L../src -L../src/.libs -llcms -I../include -o icclink -lm
33 install: icctrans icc2ps icclink
34 diff -Nur lcms-1.10/src/makefile lcms-1.10-makefiles/src/makefile
35 --- lcms-1.10/src/makefile 2003-03-01 15:42:36.000000000 +0100
36 +++ lcms-1.10-makefiles/src/makefile 2003-06-25 13:59:56.000000000 +0200
40 -CFLAGS = -g -O4 -I../include -fomit-frame-pointer -Wall
41 +CFLAGS = $(OPTFLAGS) -I../include -Wall
43 BASEDIR = $(DESTDIR)/usr
44 BINDIR = $(BASEDIR)/bin
45 LIBDIR = $(BASEDIR)/lib
46 INCDIR = $(BASEDIR)/include
52 - $(CC) $(CFLAGS) -c $<
56 + $(LIBTOOL) --mode=compile --tag CC $(CC) $(CFLAGS) -c $<
58 SRCS = cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \
59 cmslut.c cmsmatsh.c cmsmtrx.c cmspack.c cmspcs.c cmswtpnt.c \
60 cmsxform.c cmssamp.c cmscam97.c cmsnamed.c cmsps2.c
63 +OBJS = $(SRCS:.c=.lo)
67 -all: liblcms.a liblcms.so.${VERSION}
76 - $(AR) liblcms.a $(OBJS)
79 -liblcms.so.${VERSION}: $(OBJS)
80 - -$(CC) $(CFLAGS) $(LDFLAGS) -shared -o liblcms.so.${VERSION} $(OBJS)
81 - -ln -s liblcms.so.${VERSION} liblcms.so.1
82 - -ln -s liblcms.so.1 liblcms.so
84 + $(LIBTOOL) --mode=link --tag CC $(CC) -o liblcms.la $(OBJS) $(LDFLAGS) -rpath $(LIBDIR) -version-info $(VINFO) -lm
90 -install: liblcms.a liblcms.so.${VERSION}
92 mkdir -p $(BINDIR) $(LIBDIR) $(INCDIR)
93 - -cp -a liblcms.so* $(LIBDIR)
94 - cp -a liblcms.a $(LIBDIR)
95 + $(LIBTOOL) --mode=install install liblcms.la $(LIBDIR)
96 cp ../include/lcms.h ../include/icc34.h $(INCDIR)
103 - -rm $(OBJS) liblcms.a liblcms.so.${VERSION} liblcms.so.1 liblcms.so
104 + -rm -rf $(OBJS) liblcms.* .libs
106 \ Brak znaku nowej linii na koƱcu pliku
107 diff -Nur lcms-1.10/testbed/Makefile lcms-1.10-makefiles/testbed/Makefile
108 --- lcms-1.10/testbed/Makefile 2003-03-01 15:42:36.000000000 +0100
109 +++ lcms-1.10-makefiles/testbed/Makefile 2003-06-25 14:00:49.000000000 +0200
113 -CFLAGS = -g -O4 -fomit-frame-pointer -Wall -I../include
115 +CFLAGS = $(OPTFLAGS) -Wall -I../include
118 -testcms: testcms.o ../src/liblcms.a
119 - $(CC) $(CFLAGS) testcms.o ../src/liblcms.a -o $@ -lm
120 +testcms: testcms.o ../src/liblcms.la
121 + $(CC) $(CFLAGS) testcms.o $(LDFLAGS) -L../src -L../src/.libs -llcms -o $@ -lm
129 + LD_LIBRARY_PATH=../src/.libs ./testcms
134 diff -Nur lcms-1.10/tifficc/Makefile lcms-1.10-makefiles/tifficc/Makefile
135 --- lcms-1.10/tifficc/Makefile 2003-03-01 15:42:36.000000000 +0100
136 +++ lcms-1.10-makefiles/tifficc/Makefile 2003-06-25 13:51:36.000000000 +0200
140 -CFLAGS = -g -O4 -fomit-frame-pointer -Wall -I../include -I/usr/include -I/usr/local/include
141 +CFLAGS = $(OPTFLAGS) -Wall -I../include
142 BASEDIR = $(DESTDIR)/usr
143 BINDIR = $(BASEDIR)/bin
148 tifficc: tifficc.o getopt.o
149 - $(CC) $(CFLAGS) tifficc.o getopt.o ../src/liblcms.a -o $@ -lm -ljpeg -ltiff -lz
150 + $(CC) $(CFLAGS) tifficc.o getopt.o $(LDFLAGS) -L../src -L../src/.libs -llcms -o $@ -lm -ljpeg -ltiff -lz