diff options
| author | Jeremy Katz <katzj@redhat.com> | 2001-11-16 21:57:20 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2001-11-16 21:57:20 +0000 |
| commit | 3c59c7c06925c977720f88e24eb041ccc21de6ba (patch) | |
| tree | c1bbde9a24452d1719c0ae3788cc014d17194262 | |
| parent | 5f980bc081ad98b387079779fc336eb720d2946f (diff) | |
| download | anaconda-3c59c7c06925c977720f88e24eb041ccc21de6ba.tar.gz anaconda-3c59c7c06925c977720f88e24eb041ccc21de6ba.tar.xz anaconda-3c59c7c06925c977720f88e24eb041ccc21de6ba.zip | |
we only have the libisys-diet.a on i386 now...
| -rw-r--r-- | collage/Makefile | 7 | ||||
| -rw-r--r-- | utils/Makefile | 9 |
2 files changed, 13 insertions, 3 deletions
diff --git a/collage/Makefile b/collage/Makefile index 38450774d..f20c76eed 100644 --- a/collage/Makefile +++ b/collage/Makefile @@ -1,8 +1,13 @@ include ../Makefile.inc +ISYSLIB=isys +ifeq ($(ARCH),i386) +ISYSLIB=isys-diet +endif + CFLAGS = -Wall -g -O2 LDFLAGS = -g -LOADLIBES = -L../isys -L../isys/gzlib -lisys -lgunzip -lresolv -lz +LOADLIBES = -L../isys -L../isys/gzlib -l$(ISYSLIB) -lgunzip -lresolv -lz ifeq (.depend,$(wildcard .depend)) TARGET=all diff --git a/utils/Makefile b/utils/Makefile index e9aac399f..fbd255e84 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -3,7 +3,12 @@ include ../Makefile.inc ARCH := $(patsubst i%86,i386,$(shell uname -m)) ARCH := $(patsubst sparc%,sparc,$(ARCH)) -LOADLIBES = -L../isys -lisys -lpopt +ISYSLIB=isys +ifeq ($(ARCH),i386) +ISYSLIB=isys-diet +endif + +LOADLIBES = -L../isys -l$(ISYSLIB) -lpopt CFLAGS = -Wall -g -I/usr/include/rpm -I.. LDFLAGS = -g -static MODDEPS = moddeps @@ -18,7 +23,7 @@ everything: $(TARGET) all: modlist $(MODDEPS) genhdlist snarffont mapshdr readmap -modlist: modlist.o ../isys/libisys.a +modlist: modlist.o moddeps: moddeps.o $(CC) $(LDFLAGS) -o moddeps moddeps.o ../loader/modules.o \ |