diff options
| author | Erik Troan <ewt@redhat.com> | 2000-03-17 13:59:40 +0000 |
|---|---|---|
| committer | Erik Troan <ewt@redhat.com> | 2000-03-17 13:59:40 +0000 |
| commit | 1ddc70c9244c87907c0e9704233e6da6b46b4368 (patch) | |
| tree | a26fe5b58e6a11a1e8695f6961fa51fc2b1d1317 /loader/Makefile | |
| parent | ea677e91667a6142c979afa53b9f2b6ed37f4056 (diff) | |
| download | anaconda-1ddc70c9244c87907c0e9704233e6da6b46b4368.tar.gz anaconda-1ddc70c9244c87907c0e9704233e6da6b46b4368.tar.xz anaconda-1ddc70c9244c87907c0e9704233e6da6b46b4368.zip | |
don't link module stuff in on ia64
Diffstat (limited to 'loader/Makefile')
| -rw-r--r-- | loader/Makefile | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/loader/Makefile b/loader/Makefile index 6aeb2022a..3ac9dca73 100644 --- a/loader/Makefile +++ b/loader/Makefile @@ -18,6 +18,10 @@ endif PCMCIAOBJS = pcmcia.o $(NETOBJS) OPTS = -O2 -g +MODULELINKAGE = ../isys/modutils/insmod/libmodutils.a \ + ../isys/modutils/util/libutil.a \ + ../isys/modutils/obj/libobj.a + CFLAGS = $(DEBUG) $(OPTS) -Wall -D_GNU_SOURCE=1 -I/usr/include/rpm -I.. -DUSE_ALT_DNS=1 -DVERSION='"$(VERSION)"' -DHAVE_LIBIO_H -ggdb ALLOBJS = $(OBJS) $(PCMCIAOBJS) @@ -37,6 +41,7 @@ endif ifeq (ia64, $(ARCH)) BINS += loader OBJS += modstubs.o +MODULELINKAGE := endif ifeq (alpha, $(ARCH)) @@ -112,25 +117,18 @@ install: all loader: loader.o $(OBJS) $(NETOBJS) $(CC) -g $(STATIC) -o $@ $^ -lpopt \ ../kudzu/libkudzu_loader.a ../isys/libisys.a ../balkan/libbalkan.a \ - ../isys/modutils/insmod/libmodutils.a \ - ../isys/modutils/util/libutil.a \ - ../isys/modutils/obj/libobj.a \ -L../pump -lpump -lrpm -lbz2 -lz -lresolv -lnewt -lslang -lpci loader-local: loader-local.o $(OBJS) $(CC) -g $(STATIC) -o $@ $^ -lpopt \ ../kudzu/libkudzu_loader.a ../isys/libisys.a ../balkan/libbalkan.a \ - ../isys/modutils/insmod/libmodutils.a \ - ../isys/modutils/util/libutil.a \ - ../isys/modutils/obj/libobj.a \ + $(MODULELINKAGE) \ -L ../stubs -L../pump -lpump -lz -lresolv -lnewt -lslang -lpci loader-network: loader-net.o $(OBJS) $(NETOBJS) $(CC) -g $(STATIC) -o $@ $^ -lpopt \ ../kudzu/libkudzu_loader.a ../isys/libisys.a ../balkan/libbalkan.a \ - ../isys/modutils/insmod/libmodutils.a \ - ../isys/modutils/util/libutil.a \ - ../isys/modutils/obj/libobj.a \ + $(MODULELINKAGE) \ -L../pump -lpump -lrpm -lbz2 -lz -lresolv -lnewt -lslang -lpci loader-pcmcia: loader-pcmcia.o pcmcia.o popen.o $(OBJS) $(PCMCIAOBJS) @@ -138,9 +136,7 @@ loader-pcmcia: loader-pcmcia.o pcmcia.o popen.o $(OBJS) $(PCMCIAOBJS) $(PCMCIAOBJS) -L pcmcia-install/cardmgr -lcardmgr -lprobe popen.o \ -lpopt \ ../kudzu/libkudzu_loader.a ../isys/libisys.a ../balkan/libbalkan.a \ - ../isys/modutils/insmod/libmodutils.a \ - ../isys/modutils/util/libutil.a \ - ../isys/modutils/obj/libobj.a \ + $(MODULELINKAGE) \ -L../pump -lpump -lrpm -lbz2 -lz -lresolv -lnewt -lslang -lpci loader.o: loader.c |