Package: chmlib
Version: 0.31
Author: Guillem Jover <guillem@hadrons.org>
Status: not-sent
Description:
 Do not hardcode gcc version to use.
 Add soversion.
 Fix libtool calls.
 Move -lpthreads to a non-user variable.

diff -Naur chmlib-0.31.orig/Makefile chmlib-0.31/Makefile
--- chmlib-0.31.orig/Makefile	2002-10-10 05:25:54.000000000 +0200
+++ chmlib-0.31/Makefile	2003-11-29 23:03:34.000000000 +0100
@@ -1,51 +1,55 @@
-
 ## Available defines for building chm_lib with particular options
+#
 # CHM_MT:        build thread-safe version of chm_lib
 # CHM_USE_PREAD: build chm_lib to use pread/pread64 for all I/O
 # CHM_USE_IO64:  build chm_lib to support 64-bit file I/O
 #
 # Note: LDFLAGS must contain -lpthread if you are using -DCHM_MT.
-#
-#CFLAGS=-DCHM_MT -DCHM_USE_PREAD -DCHM_USE_IO64
-CFLAGS=-DCHM_MT -DCHM_USE_PREAD -DCHM_USE_IO64 -g -DDMALLOC_DISABLE
-LDFLAGS=-lpthread
-INSTALLPREFIX=/usr/local/
-CC=gcc-3.2
-LD=gcc-3.2
-LIBTOOL=libtool
-CP=/bin/cp
-EXAMPLES=test_chmLib enum_chmLib enumdir_chmLib chm_http extract_chmLib
+
+PREFIX=/usr/local
+
+#CFLAGS = -DCHM_MT -DCHM_USE_PREAD -DCHM_USE_IO64
+CFLAGS  = -DCHM_MT -DCHM_USE_PREAD -DCHM_USE_IO64 -g -DDMALLOC_DISABLE
+LDFLAGS =
+LIB_VERSION = -version-info 0:31:0
+LIB_LINK = -lpthread
+libdir = ${PREFIX}/lib
+CC = gcc
+LD = gcc
+LIBTOOL = libtool
+INSTALL = install
+EXAMPLES = test_chmLib enum_chmLib enumdir_chmLib chm_http extract_chmLib
 
 all: libchm.la
 
 examples: ${EXAMPLES}
 
 %.lo: %.c
-	${LIBTOOL} ${CC} -c -o $@ $^ ${CFLAGS}
+	${LIBTOOL} --mode=compile ${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $^
 
 libchm.la: chm_lib.lo lzx.lo
-	${LIBTOOL} ${LD} -o $@ $^ ${LDFLAGS} -rpath ${INSTALLPREFIX}/lib
+	${LIBTOOL} --mode=link ${LD} ${CFLAGS} ${LDFLAGS} -o $@ -rpath ${libdir} ${LIB_VERSION} ${LIB_LINK} $^
 
 install: libchm.la
 	chmod a+r libchm.la
-	${LIBTOOL} --mode=install ${CP} libchm.la ${INSTALLPREFIX}/lib
-	${CP} chm_lib.h ${INSTALLPREFIX}/include
+	${LIBTOOL} --mode=install ${INSTALL} libchm.la $(DESTDIR)${libdir}
+	${INSTALL} chm_lib.h $(DESTDIR)${PREFIX}/include
 
 clean:
 	rm -fr libchm.la *.o *.lo .libs ${EXAMPLES}
 
 test_chmLib: test_chmLib.c
-	${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm ${CFLAGS}
+	${CC} -o $@ $^ -lchm ${CFLAGS}
 
 enum_chmLib: enum_chmLib.c
-	${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm ${CFLAGS}
+	${CC} -o $@ $^ -lchm ${CFLAGS}
 
 enumdir_chmLib: enumdir_chmLib.c
-	${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm ${CFLAGS}
+	${CC} -o $@ $^ -lchm ${CFLAGS}
 
 extract_chmLib: extract_chmLib.c
-	${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm ${CFLAGS}
+	${CC} -o $@ $^ -lchm ${CFLAGS}
 
 chm_http: chm_http.c
-	${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm -lpthread ${CFLAGS}
+	${CC} -o $@ $^ -lchm -lpthread ${CFLAGS}