From 6852ddb329d0c0f38b181f5f50d3414cf4be3f23 Mon Sep 17 00:00:00 2001 From: "Mirar (Pontus Hagland)" <pike@sort.mirar.org> Date: Mon, 23 Mar 1998 21:29:08 +0100 Subject: [PATCH] Make for encodings/ major clean up Rev: src/modules/Image/Makefile.in:1.13 Rev: src/modules/Image/encodings/Makefile.in:1.13 --- src/modules/Image/Makefile.in | 2 +- src/modules/Image/encodings/Makefile.in | 25 ++++++------------------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/src/modules/Image/Makefile.in b/src/modules/Image/Makefile.in index 591cc1c866..1fe9306f26 100644 --- a/src/modules/Image/Makefile.in +++ b/src/modules/Image/Makefile.in @@ -5,7 +5,7 @@ OBJS = image.o font.o togif.o matrix.o pnm.o blit.o \ orient.o MODNAME=image MODULE_SUBDIRS=encodings -MODULE_ARCHIVES=encodings/gif.a encodings/pnm.a encodings/x.a +MODULE_ARCHIVES=encodings/encodings.a MODULE_LDFLAGS=@LDFLAGS@ @SET_MAKE@ diff --git a/src/modules/Image/encodings/Makefile.in b/src/modules/Image/encodings/Makefile.in index f2468c0eac..87ee09cd7f 100644 --- a/src/modules/Image/encodings/Makefile.in +++ b/src/modules/Image/encodings/Makefile.in @@ -1,9 +1,6 @@ SRCDIR=@srcdir@ VPATH=@srcdir@:@srcdir@/../../..:../../.. -GIF_OBJS = gif.o gif_lzw.o -PNM_OBJS = pnm.o -X_OBJS = x.o -OBJS=gif.a pnm.a x.a +OBJS = gif.o gif_lzw.o pnm.o x.o xwd.o @SET_MAKE@ @@ -15,22 +12,12 @@ RANLIB=@RANLIB@ PREFLAGS=-I. -I$(SRCDIR) -I$(SRCDIR)/../../.. -I$(SRCDIR)/.. -I../../.. -I.. -I. $(MODULE_CPPFLAGS) $(DEFINES) CFLAGS=$(PREFLAGS) $(OTHERFLAGS) $(MODULE_CFLAGS) @CCSHARED@ -all: $(OBJS) +all: encodings.a -gif.a : $(GIF_OBJS) - rm -f gif.a - $(AR) cq gif.a $(GIF_OBJS) - $(RANLIB) gif.a - -x.a : $(X_OBJS) - rm -f x.a - $(AR) cq x.a $(X_OBJS) - $(RANLIB) x.a - -pnm.a : $(PNM_OBJS) - rm -f pnm.a - $(AR) cq pnm.a $(PNM_OBJS) - $(RANLIB) pnm.a +encodings.a : $(OBJS) + rm -f encodings.a + $(AR) cq encodings.a $(OBJS) + $(RANLIB) encodings.a depend: gcc -MM $(PREFLAGS) $(SRCDIR)/*.c | $(TMP_BINDIR)/fixdepends.sh $(SRCDIR) -- GitLab