76 lines
2.5 KiB
Text
76 lines
2.5 KiB
Text
$NetBSD: patch-ad,v 1.3 2001/03/26 22:51:39 skrll Exp $
|
|
|
|
--- cnv/makefile.src.orig Mon Dec 11 14:58:05 1995
|
|
+++ cnv/makefile.src
|
|
@@ -71,19 +71,16 @@
|
|
|
|
#ifdef PBMPLUS
|
|
#emit PBMDIR
|
|
-PBMDIR =
|
|
+#PBMDIR =
|
|
# pgmtorle - pgm format to RLE
|
|
# ppmtorle - ppm format to RLE
|
|
# rletoppm - RLE to ppm format
|
|
pgmtorle.out: pgmtorle.c
|
|
- $(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
|
|
- mv $*.new $@
|
|
+ ${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${INCPBMPLUS} $*.c -o $*.out ${LIBPBMPLUS} ../lib/librle.la -lm
|
|
ppmtorle.out: ppmtorle.c
|
|
- $(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
|
|
- mv $*.new $@
|
|
+ ${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${INCPBMPLUS} $*.c -o $*.out ${LIBPBMPLUS} ../lib/librle.la -lm
|
|
rletoppm.out: rletoppm.c
|
|
- $(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
|
|
- mv $*.new $@
|
|
+ ${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${INCPBMPLUS} $*.c -o $*.out ${LIBPBMPLUS} ../lib/librle.la -lm
|
|
#endif
|
|
|
|
#ifdef POSTSCRIPT
|
|
@@ -95,11 +92,9 @@
|
|
# iristorle/rletoiris - Convert between RLE and SGI image format.
|
|
#
|
|
iristorle.out: iristorle.c
|
|
- $(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new
|
|
- mv $*.new $@
|
|
+ $(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.out
|
|
rletoiris.out: rletoiris.c
|
|
- $(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new
|
|
- mv $*.new $@
|
|
+ $(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.out
|
|
#endif
|
|
|
|
#ifdef TIFF
|
|
@@ -108,11 +103,9 @@
|
|
# tifftorle - Convert TIFF images to RLE
|
|
# rletotiff - Convert RLE images to TIFF
|
|
rletotiff.out: rletotiff.c
|
|
- $(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new
|
|
- mv $*.new $@
|
|
+ ${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${INCTIFF} $*.c -o $*.out ${LIBTIFF} ../lib/librle.la -lm
|
|
tifftorle.out: tifftorle.c
|
|
- $(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new
|
|
- mv $*.new $@
|
|
+ ${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${INCTIFF} $*.c -o $*.out ${LIBTIFF} ../lib/librle.la -lm
|
|
#endif
|
|
|
|
#ifdef WASATCH
|
|
@@ -125,8 +118,7 @@
|
|
# Will build with the default rule.
|
|
# rletorla - RLE to Wavefront RLA
|
|
rletorla.out: rletorla.c
|
|
- $(CC) $(CFLAGS) $*.c $(LIBS) $(LIBWAVEFRONT) -lm -o $*.new
|
|
- mv $*.new $@
|
|
+ ${LIBTOOL} --mode=link ${CC} ${CFLAGS} $*.c -o $*.out ${LIBWAVEFRONT} ../lib/librle.la -lm
|
|
#endif WAVEFRONT
|
|
|
|
# Install stuff
|
|
@@ -144,8 +136,7 @@
|
|
.SUFFIXES:
|
|
.SUFFIXES: .out .c
|
|
.c.out:
|
|
- $(CC) $(CFLAGS) $*.c $(LIBS) -lm -o $*.new
|
|
- mv $*.new $@
|
|
+ ${LIBTOOL} --mode=link ${CC} ${CFLAGS} $*.c -o $*.out ../lib/librle.la -lm
|
|
|
|
# Dependency lines. Make sure to #ifdef them.
|
|
# DO NOT DELETE THIS LINE
|