From 62f6ff407bc4f2cf03d1fa7cf3dc9a3f4026624a Mon Sep 17 00:00:00 2001 From: Nathan Wagner Date: Thu, 14 Feb 2019 21:00:53 +0000 Subject: [PATCH] fix compile process for elf programs --- Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index f4143d5..1f3ea83 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,8 @@ SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-preserve zpm-test zpm-log \ zpm-contents zpm-uninstall zpm-pathmod zpm-rmpackage zpm-newpackage \ zpm-pkg zpm-pkgfile zpm-gc zpm-repo zpm-update zpm-confgit -MANPAGES=doc/zpm.8 $(addprefix doc/zpm-, list.8 contents.8 hash.8 quote.8 pathmod.8 note.8 vercmp.8 repo.8 gc.8) +MANPAGES=$(shell ls doc/*.8) +#MANPAGES=doc/zpm.8 $(addprefix doc/zpm-, list.8 contents.8 hash.8 quote.8 pathmod.8 note.8 vercmp.8 repo.8 gc.8) COMPILED=$(ZPKGBIN) PROGRAMS=$(SCRIPTS) $(COMPILED) @@ -109,14 +110,14 @@ programs: $(ZPKGBIN) uncompress: uncompress.o $(CC) $(CFLAGS) -o $@ $+ -llzma -zpm-elftype: elf/elftype.c - $(CC) -Ielf $(CFLAGS) -o $@ $+ +zpm-elftype: elf/elftype.o + $(CC) $(CFLAGS) -Ielf $(LDFLAGS) -o $@ $+ -zpm-soname: elf/soname.c - $(CC) -Ielf $(CFLAGS) -o $@ $+ +zpm-soname: elf/soname.o + $(CC) $(CFLAGS) -Ielf $(LDFLAGS) -o $@ $+ -zpm-soneed: elf/needed.c - $(CC) -Ielf $(CFLAGS) -o $@ $+ +zpm-soneed: elf/needed.o + $(CC) $(CFLAGS) -Ielf $(LDFLAGS) -o $@ $+ zpm-addfile: zpm-addfile.o libzpm.a libelf.a $(CC) -Ielf $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -- 2.40.0