70 lines
2.3 KiB
Text
70 lines
2.3 KiB
Text
$NetBSD: patch-an,v 1.3 2001/03/26 22:51:39 skrll Exp $
|
|
|
|
--- tools/makefile.src.orig Tue Jan 28 18:47:42 1992
|
|
+++ tools/makefile.src
|
|
@@ -13,7 +13,6 @@
|
|
mergechan.out \
|
|
pyrmask.out \
|
|
repos.out \
|
|
- rleClock.out \
|
|
rleaddcom.out \
|
|
rlebg.out \
|
|
rlebox.out \
|
|
@@ -49,7 +48,7 @@
|
|
ALLDIRS = clock
|
|
|
|
# Default is what is to be made if nothing is specified.
|
|
-default: $(PGMS)
|
|
+default: $(PGMS) rleClock.out
|
|
|
|
# Everything depends on the rle headers and libraries.
|
|
$(PGMS): $(RI)/rle.h $(RI)/rle_config.h
|
|
@@ -62,30 +61,27 @@
|
|
pyrlib.o: pyrlib.c $(RI)/pyramid.h $(RI)/rle.h $(RI)/rle_config.h
|
|
$(CC) $(CFLAGS) pyrlib.c -c
|
|
pyrmask.out: pyrlib.o pyrmask.c $(RI)/pyramid.h
|
|
- $(CC) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new
|
|
- mv pyrmask.new pyrmask.out
|
|
+ ${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} pyrmask.c pyrlib.o ../lib/librle.la -lm -o pyrmask.out
|
|
|
|
fant.out: fant.o mallocNd.o
|
|
- $(CC) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new
|
|
- mv fant.new fant.out
|
|
+ ${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} fant.o mallocNd.o ../lib/librle.la -lm -o fant.out
|
|
|
|
# rlebox and crop use some common code.
|
|
rle_box.o: $(RI)/rle.h $(RI)/rle_config.h $(RI)/rle_raw.h
|
|
|
|
crop.out: crop.c rle_box.o
|
|
- ${CC} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new
|
|
- mv crop.new crop.out
|
|
+ ${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} crop.c rle_box.o ../lib/librle.la -lm -o crop.out
|
|
rlebox.out: rlebox.c rle_box.o
|
|
- ${CC} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new
|
|
- mv rlebox.new rlebox.out
|
|
+ ${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} rlebox.c rle_box.o ../lib/librle.la -lm -o rlebox.out
|
|
|
|
-# rleClock has it's own directory, must be built special
|
|
+# rleClock has its own directory, must be built specially
|
|
|
|
rleClock.out: clock/font.c clock/font.h clock/font.src clock/rleClock.c
|
|
- (cd clock ; make)
|
|
+ (cd clock ; $(MAKE))
|
|
|
|
# Incremental install, copies everything ("$?") since last install to DEST dir.
|
|
install: $(PGMS) install-pgm
|
|
+ (cd clock ; $(MAKE) install)
|
|
touch install
|
|
|
|
# Clean up installed stuff and binaries
|
|
@@ -100,8 +96,7 @@
|
|
.SUFFIXES:
|
|
.SUFFIXES: .out .c .o
|
|
.c.out:
|
|
- $(CC) $(CFLAGS) $< $(LIBS) -lm -o $*.new
|
|
- mv $*.new $@
|
|
+ ${LIBTOOL} --mode=link ${CC} ${CFLAGS} -I${RI} $< ../lib/librle.la -lm -o $*.out
|
|
|
|
.c.o:
|
|
- $(CC) -c $(CFLAGS) $<
|
|
+ ${LIBTOOL} --mode=compile ${CC} ${CFLAGS} -c $<
|