projects / packages / lcms.git / blame
| Commit | Line | Data |
|---|---|---|
| 38ffa639 JB |
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 | |
| 4 | @@ -1,14 +1,14 @@ | |
| 5 | SHELL = /bin/sh | |
| 6 | ||
| 7 | -CFLAGS = -g -O4 -Wall | |
| 8 | +CFLAGS = $(OPTFLAGS) -Wall | |
| 9 | ||
| 10 | all: icctrans wtpt | |
| 11 | ||
| 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 | |
| 15 | ||
| 16 | wtpt: wtpt.c | |
| 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 | |
| 19 | ||
| 20 | install: | |
| 21 | # Nothing to install | |
| 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 | |
| 25 | @@ -1,49 +1,42 @@ | |
| 26 | SHELL = /bin/sh | |
| 27 | ||
| 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 | |
| 34 | VERSION = 1.0.8 | |
| 35 | -AR = ar -cru | |
| 36 | -RANLIB = ranlib | |
| 37 | +VINFO = 1:8:0 | |
| 38 | +LIBTOOL = libtool | |
| 39 | ||
| 40 | -.c.o: | |
| 41 | - $(CC) $(CFLAGS) $(LDFLAGS) -c $< | |
| 42 | +%.lo: %.c | |
| 43 | + $(LIBTOOL) $(CC) $(CFLAGS) -c $< | |
| 44 | ||
| 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 | |
| 48 | ||
| 49 | -OBJS = $(SRCS:.c=.o) | |
| 50 | +OBJS = $(SRCS:.c=.lo) | |
| 51 | ||
| 52 | ||
| 53 | ||
| 54 | -all: liblcms.a liblcms.so.${VERSION} | |
| 55 | +all: liblcms.la | |
| 56 | ||
| 57 | ||
| 58 | # | |
| 59 | # Library | |
| 60 | # | |
| 61 | ||
| 62 | -liblcms.a: $(OBJS) | |
| 63 | - $(AR) liblcms.a $(OBJS) | |
| 64 | - $(RANLIB) liblcms.a | |
| 65 | - | |
| 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 | |
| 70 | +liblcms.la: $(OBJS) | |
| 71 | + $(LIBTOOL) $(CC) -o liblcms.la $(OBJS) $(LDFLAGS) -rpath $(LIBDIR) -version-info $(VINFO) -lm | |
| 72 | ||
| 73 | # | |
| 74 | # Installation | |
| 75 | # | |
| 76 | ||
| 77 | -install: liblcms.a liblcms.so.${VERSION} | |
| 78 | +install: liblcms.la | |
| 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) | |
| 84 | ||
| 85 | # | |
| 86 | @@ -60,4 +53,4 @@ | |
| 87 | # | |
| 88 | ||
| 89 | clean: | |
| 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 | |
| 95 | @@ -1,16 +1,16 @@ | |
| 96 | SHELL = /bin/sh | |
| 97 | ||
| 98 | -CFLAGS = -g -O4 -fomit-frame-pointer -Wall -I../include | |
| 99 | +CFLAGS = $(OPTFLAGS) -Wall -I../include | |
| 100 | ||
| 101 | testcms.o: testcms.c | |
| 102 | ||
| 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 | |
| 107 | ||
| 108 | all: testcms test | |
| 109 | ||
| 110 | test: testcms | |
| 111 | - ./testcms | |
| 112 | + LD_LIBRARY_PATH=../src/.libs ./testcms | |
| 113 | ||
| 114 | install: | |
| 115 | # Nothing to install | |
| 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 | |
| 119 | @@ -1,11 +1,11 @@ | |
| 120 | SHELL = /bin/sh | |
| 121 | ||
| 122 | -CFLAGS = -g -O4 -fomit-frame-pointer -Wall -I../include -I/usr/include -I/usr/local/include | |
| 123 | +CFLAGS = $(OPTFLAGS) -Wall -I../include | |
| 124 | ||
| 125 | all: tifficc | |
| 126 | ||
| 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 | |
| 130 | ||
| 131 | tifficc.o: tifficc.c | |
| 132 | getopt.o: getopt.c |