$NetBSD: patch-aa,v 1.6 2006/08/30 15:34:34 rillig Exp $ --- Makefile.in.orig 2006-03-25 14:15:04.000000000 +0100 +++ Makefile.in 2006-08-30 17:31:54.649362344 +0200 @@ -42,15 +42,15 @@ OBJS += dact_common.o comp_fail.o comp_p SHLIBOBJS += dact_common_shr.o comp_fail_shr.o comp_plain_shr.o buffer_shr.o header_shr.o sort_shr.o module_shr.o parse_shr.o dendian_shr.o crc_shr.o net_shr.o ui_shr.o sfx_shr.o libdact_shr.o @SHLIBOBJS@ ALGO = comp_snibble.c comp_delta.c comp_text.c comp_rle.c cipher_chaos.c cipher_sub.c cipher_psub.c @ALGO@ -TOBUILD = dact$(EXEEXT) libdact.$(SHOBJEXT) libdact.a dact.conf +TOBUILD = dact$(EXEEXT) dact.conf all: @DEFAULT@ -module: @DEPEND@ +module: @MODS="$(ALGO:.c=.so)" LDLIBS="@ALLMODLIBS@" \ $(MAKE) $(TOBUILD) -static: @DEPEND@ +static: @OBJS="$(ALGO:.c=.o) $(CR_OBJ)" SHLIBOBJS="$(ALGO:.c=_shr.o)" LDLIBS="$(MODLIBS)" $(MAKE) $(TOBUILD) dact.conf: Makefile @@ -63,7 +63,7 @@ dact.conf: Makefile @echo "binary_check off" >> dact.conf @echo "module_dir $(datadir)/dact" >> dact.conf @echo "module_load_all off" >> dact.conf -@MODS@ @for so in $(MODS:.so=); do echo "load_module $$so" >> dact.conf; done +@MODS@ @for so in :dummy: $(MODS:.so=); do case $$so in :dummy:) continue;; esac; echo "load_module $$so" >> dact.conf; done dact$(EXEEXT): $(OBJS) $(MODS) $(CC) $(OBJS) $(LIBS) -o dact$(EXEEXT) $(LDLIBS) $(LDFLAGS) @@ -101,14 +101,9 @@ install: all install-bin -$(INSTALL) -d $(libdir) -$(INSTALL) -d $(datadir)/dact -$(INSTALL) -d $(sysconfdir) - $(INSTALL) -m 644 dact.conf $(CONF) + $(INSTALL) -m 644 dact.conf $(datadir)/examples/dact $(INSTALL) -m 644 Docs/dact.1 $(mandir)/man1/dact.1 - -$(INSTALL) -m 755 libdact.$(SHOBJEXT) $(libdir)/libdact.$(SHOBJEXT) - -$(INSTALL) -m 644 libdact.$(SHOBJEXT).def $(libdir)/libdact.$(SHOBJEXT).def - -$(INSTALL) -m 644 libdact.$(SHOBJEXT).a $(libdir)/libdact.$(SHOBJEXT).a - -$(INSTALL) -m 644 libdact.a $(libdir)/libdact.a -@MODS@ for so in $(MODS); do $(INSTALL) -m 755 $$so $(datadir)/dact/$$so; done - ./patch-magic-file $(datadir)/magic +@MODS@ for so in :dummy: $(MODS); do case $$so in :dummy:) continue;; esac; $(INSTALL) -m 755 $$so $(datadir)/dact/$$so; done install-bin-local: dact$(EXEEXT) -$(INSTALL) -d $(HOME)/.dact/`uname -s | tr A-Z a-z`-`uname -m` @@ -127,11 +122,10 @@ uninstall: rm -f $(libdir)/libdact.a $(libdir)/libdact.$(SHOBJEXT) @MODS@ rm -rf $(datadir)/dact -depend: Makefile.dep +depend: Makefile.dep: *.c *.h Makefile @echo "building Makefile.dep" @$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(ALGO) $(OBJS:.o=.c) $(MODS:.so=.c) dact.c > Makefile.dep @$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(ALGO) $(filter-out libdact.c, $(OBJS:.o=.c)) $(MODS:.so=.c) dact.c | sed -e "s/^\([^ ]*\)\.o: /\1.so: /g" >> Makefile.dep -include Makefile.dep