]>
Commit | Line | Data |
---|---|---|
0109c92f | 1 | --- lcms-1.09/samples/Makefile Fri Jun 14 15:07:01 2002 |
2 | +++ lcms-1.09.new/samples/Makefile Sat Mar 1 13:09:10 2003 | |
3 | @@ -1,6 +1,6 @@ | |
38ffa639 JB |
4 | SHELL = /bin/sh |
5 | ||
6 | -CFLAGS = -g -O4 -Wall | |
7 | +CFLAGS = $(OPTFLAGS) -Wall | |
0109c92f | 8 | BASEDIR = $(DESTDIR)/usr |
9 | BINDIR = $(BASEDIR)/bin | |
38ffa639 | 10 | |
0109c92f | 11 | @@ -8,10 +8,10 @@ |
38ffa639 JB |
12 | all: icctrans wtpt |
13 | ||
14 | icctrans: icctrans.c xgetopt.c | |
15 | - $(CC) $(CFLAGS) icctrans.c xgetopt.c ../src/liblcms.a -I../include -o icctrans -lm | |
16 | + $(CC) $(CFLAGS) icctrans.c xgetopt.c $(LDFLAGS) -L../src -L../src/.libs -llcms -I../include -o icctrans -lm | |
17 | ||
18 | wtpt: wtpt.c | |
19 | - $(CC) $(CFLAGS) wtpt.c ../src/liblcms.a -I../include -o wtpt -lm | |
20 | + $(CC) $(CFLAGS) wtpt.c $(LDFLAGS) -L../src -L../src/.libs -llcms -I../include -o wtpt -lm | |
21 | ||
0109c92f | 22 | install: icctrans |
23 | -cp icctrans $(BINDIR) | |
24 | --- lcms-1.09/src/makefile Mon Jun 17 14:29:45 2002 | |
25 | +++ lcms-1.09.new/src/makefile Sat Mar 1 13:36:14 2003 | |
f4c888f2 | 26 | @@ -1,50 +1,43 @@ |
38ffa639 JB |
27 | SHELL = /bin/sh |
28 | ||
0109c92f | 29 | -CFLAGS = -g -O4 -I../include -fomit-frame-pointer -Wall |
30 | +CFLAGS = $(OPTFLAGS) -I../include -Wall | |
31 | LDFLAGS = -lm | |
38ffa639 JB |
32 | BASEDIR = $(DESTDIR)/usr |
33 | BINDIR = $(BASEDIR)/bin | |
34 | LIBDIR = $(BASEDIR)/lib | |
35 | INCDIR = $(BASEDIR)/include | |
0109c92f | 36 | VERSION = 1.0.9 |
38ffa639 JB |
37 | -AR = ar -cru |
38 | -RANLIB = ranlib | |
0109c92f | 39 | +VINFO = 1:9:0 |
38ffa639 JB |
40 | +LIBTOOL = libtool |
41 | ||
42 | -.c.o: | |
0109c92f | 43 | - $(CC) $(CFLAGS) -c $< |
44 | +%.lo: %.c | |
f4c888f2 | 45 | + $(LIBTOOL) --mode=compile --tag CC $(CC) $(CFLAGS) -c $< |
38ffa639 JB |
46 | |
47 | SRCS = cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \ | |
48 | cmslut.c cmsmatsh.c cmsmtrx.c cmspack.c cmspcs.c cmswtpnt.c \ | |
49 | cmsxform.c cmssamp.c cmscam97.c | |
50 | ||
51 | -OBJS = $(SRCS:.c=.o) | |
52 | +OBJS = $(SRCS:.c=.lo) | |
53 | ||
54 | ||
55 | ||
f4c888f2 JB |
56 | -all: liblcms.a liblcms.so.${VERSION} |
57 | +all: liblcms.la | |
58 | ||
59 | ||
60 | # | |
38ffa639 JB |
61 | # Library |
62 | # | |
63 | ||
64 | -liblcms.a: $(OBJS) | |
65 | - $(AR) liblcms.a $(OBJS) | |
66 | - $(RANLIB) liblcms.a | |
67 | - | |
68 | -liblcms.so.${VERSION}: $(OBJS) | |
69 | - -$(CC) $(CFLAGS) $(LDFLAGS) -shared -o liblcms.so.${VERSION} $(OBJS) | |
70 | - -ln -s liblcms.so.${VERSION} liblcms.so.1 | |
71 | - -ln -s liblcms.so.1 liblcms.so | |
72 | +liblcms.la: $(OBJS) | |
f4c888f2 | 73 | + $(LIBTOOL) --mode=link --tag CC $(CC) -o liblcms.la $(OBJS) $(LDFLAGS) -rpath $(LIBDIR) -version-info $(VINFO) -lm |
38ffa639 JB |
74 | |
75 | # | |
76 | # Installation | |
77 | # | |
78 | ||
79 | -install: liblcms.a liblcms.so.${VERSION} | |
80 | +install: liblcms.la | |
81 | mkdir -p $(BINDIR) $(LIBDIR) $(INCDIR) | |
82 | - -cp -a liblcms.so* $(LIBDIR) | |
83 | - cp -a liblcms.a $(LIBDIR) | |
f4c888f2 | 84 | + $(LIBTOOL) --mode=install install liblcms.la $(LIBDIR) |
38ffa639 JB |
85 | cp ../include/lcms.h ../include/icc34.h $(INCDIR) |
86 | ||
87 | # | |
0109c92f | 88 | @@ -61,4 +54,5 @@ |
38ffa639 JB |
89 | # |
90 | ||
91 | clean: | |
92 | - -rm $(OBJS) liblcms.a liblcms.so.${VERSION} liblcms.so.1 liblcms.so | |
0109c92f | 93 | + -rm -rf $(OBJS) liblcms.* .libs |
94 | + | |
38ffa639 JB |
95 | diff -Nur lcms-1.08.orig/testbed/Makefile lcms-1.08/testbed/Makefile |
96 | --- lcms-1.08.orig/testbed/Makefile Tue Nov 13 21:54:50 2001 | |
97 | +++ lcms-1.08/testbed/Makefile Wed Jun 26 21:16:29 2002 | |
98 | @@ -1,16 +1,16 @@ | |
99 | SHELL = /bin/sh | |
100 | ||
101 | -CFLAGS = -g -O4 -fomit-frame-pointer -Wall -I../include | |
102 | +CFLAGS = $(OPTFLAGS) -Wall -I../include | |
103 | ||
104 | testcms.o: testcms.c | |
105 | ||
106 | -testcms: testcms.o ../src/liblcms.a | |
107 | - $(CC) $(CFLAGS) testcms.o ../src/liblcms.a -o $@ -lm | |
108 | +testcms: testcms.o ../src/liblcms.la | |
109 | + $(CC) $(CFLAGS) testcms.o $(LDFLAGS) -L../src -L../src/.libs -llcms -o $@ -lm | |
110 | ||
111 | all: testcms test | |
112 | ||
113 | test: testcms | |
114 | - ./testcms | |
115 | + LD_LIBRARY_PATH=../src/.libs ./testcms | |
116 | ||
117 | install: | |
118 | # Nothing to install | |
0109c92f | 119 | --- lcms-1.09/tifficc/Makefile Fri Jun 14 15:49:53 2002 |
120 | +++ lcms-1.09.new/tifficc/Makefile Sat Mar 1 13:40:59 2003 | |
121 | @@ -1,6 +1,6 @@ | |
38ffa639 JB |
122 | SHELL = /bin/sh |
123 | ||
124 | -CFLAGS = -g -O4 -fomit-frame-pointer -Wall -I../include -I/usr/include -I/usr/local/include | |
125 | +CFLAGS = $(OPTFLAGS) -Wall -I../include | |
0109c92f | 126 | BASEDIR = $(DESTDIR)/usr |
127 | BINDIR = $(BASEDIR)/bin | |
38ffa639 | 128 | |
0109c92f | 129 | @@ -8,7 +8,7 @@ |
38ffa639 JB |
130 | all: tifficc |
131 | ||
132 | tifficc: tifficc.o getopt.o | |
133 | - $(CC) $(CFLAGS) tifficc.o getopt.o ../src/liblcms.a -o $@ -lm -ljpeg -ltiff -lz | |
134 | + $(CC) $(CFLAGS) tifficc.o getopt.o $(LDFLAGS) -L../src -L../src/.libs -llcms -o $@ -lm -ljpeg -ltiff -lz | |
135 | ||
136 | tifficc.o: tifficc.c | |
137 | getopt.o: getopt.c |