- updated for version 1.10

[packages/lcms.git] / lcms-makefiles.patch

diff -Nur lcms-1.10/samples/Makefile lcms-1.10-makefiles/samples/Makefile
--- lcms-1.10/samples/Makefile	2003-03-01 15:42:35.000000000 +0100
+++ lcms-1.10-makefiles/samples/Makefile	2003-06-25 13:56:47.000000000 +0200
@@ -1,6 +1,6 @@
 SHELL = /bin/sh
 
-CFLAGS = -g -O4 -Wall
+CFLAGS = $(OPTFLAGS) -Wall
 BASEDIR = $(DESTDIR)/usr
 BINDIR  = $(BASEDIR)/bin
 
@@ -8,16 +8,16 @@
 all:	icctrans wtpt icc2ps icclink
 
 icctrans: icctrans.c xgetopt.c
-	$(CC) $(CFLAGS) icctrans.c xgetopt.c ../src/liblcms.a -I../include -o icctrans -lm
+	$(CC) $(CFLAGS) icctrans.c xgetopt.c $(LDFLAGS) -L../src -L../src/.libs -llcms -I../include -o icctrans -lm
 
 wtpt: wtpt.c
-	$(CC) $(CFLAGS) wtpt.c ../src/liblcms.a -I../include -o wtpt -lm
-
+	$(CC) $(CFLAGS) wtpt.c $(LDFLAGS) -L../src -L../src/.libs -llcms -I../include -o wtpt -lm
+	
 icc2ps: icc2ps.c xgetopt.c
-	$(CC) $(CFLAGS) icc2ps.c xgetopt.c ../src/liblcms.a -I../include -o icc2ps -lm
+	$(CC) $(CFLAGS) icc2ps.c xgetopt.c $(LDFLAGS) -L../src -L../src/.libs -llcms -I../include -o icc2ps -lm	
 
 icclink: icclink.c xgetopt.c
-	$(CC) $(CFLAGS) icclink.c xgetopt.c ../src/liblcms.a -I../include -o icclink -lm
+	$(CC) $(CFLAGS) icclink.c xgetopt.c $(LDFLAGS) -L../src -L../src/.libs -llcms -I../include -o icclink -lm
 
 
 install: icctrans icc2ps icclink
diff -Nur lcms-1.10/src/makefile lcms-1.10-makefiles/src/makefile
--- lcms-1.10/src/makefile	2003-03-01 15:42:36.000000000 +0100
+++ lcms-1.10-makefiles/src/makefile	2003-06-25 13:59:56.000000000 +0200
@@ -1,50 +1,42 @@
 SHELL = /bin/sh
 
-CFLAGS  = -g -O4 -I../include -fomit-frame-pointer -Wall 
+CFLAGS  = $(OPTFLAGS) -I../include -Wall
 LDFLAGS = -lm
 BASEDIR = $(DESTDIR)/usr
 BINDIR  = $(BASEDIR)/bin
 LIBDIR  = $(BASEDIR)/lib
 INCDIR  = $(BASEDIR)/include
 VERSION = 1.0.10
-AR      = ar -cru
-RANLIB  = ranlib
-
-.c.o:	
-	$(CC) $(CFLAGS) -c $<
+VINFO = 1:10:0
+LIBTOOL = libtool
+%.lo:  %.c
+	$(LIBTOOL) --mode=compile --tag CC $(CC) $(CFLAGS) -c $<
 
 SRCS = cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \
 	cmslut.c cmsmatsh.c cmsmtrx.c cmspack.c cmspcs.c cmswtpnt.c \
 	cmsxform.c cmssamp.c cmscam97.c cmsnamed.c cmsps2.c
 
-OBJS = $(SRCS:.c=.o)
+OBJS = $(SRCS:.c=.lo)
 
 
 
-all:	liblcms.a liblcms.so.${VERSION} 
+all:	liblcms.la 
 
 
 #
 # Library
 #
 
-liblcms.a: $(OBJS)
-	$(AR) liblcms.a $(OBJS)
-	$(RANLIB) liblcms.a
-
-liblcms.so.${VERSION}: $(OBJS) 
-	-$(CC) $(CFLAGS) $(LDFLAGS) -shared -o liblcms.so.${VERSION} $(OBJS) 
-	-ln -s liblcms.so.${VERSION} liblcms.so.1
-	-ln -s liblcms.so.1 liblcms.so
+liblcms.la: $(OBJS)
+	$(LIBTOOL) --mode=link --tag CC $(CC) -o liblcms.la $(OBJS) $(LDFLAGS) -rpath $(LIBDIR) -version-info $(VINFO) -lm
 
 #
 # Installation
 #
 
-install: liblcms.a  liblcms.so.${VERSION}
+install: liblcms.la
 	mkdir -p $(BINDIR) $(LIBDIR) $(INCDIR)
-	-cp -a liblcms.so* $(LIBDIR)
-	cp -a liblcms.a $(LIBDIR)
+	$(LIBTOOL) --mode=install install liblcms.la $(LIBDIR)
 	cp ../include/lcms.h ../include/icc34.h $(INCDIR)
 
 #
@@ -61,4 +53,5 @@
 #
 
 clean:
-	-rm $(OBJS)  liblcms.a liblcms.so.${VERSION} liblcms.so.1 liblcms.so
+	-rm -rf $(OBJS)  liblcms.* .libs
+