diff options
| author | Chris Lumens <clumens@redhat.com> | 2007-06-29 17:26:12 +0000 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2007-06-29 17:26:12 +0000 |
| commit | 66ea54b4f1ebe35cd2d38fb9c7b27a42dce4cb4c (patch) | |
| tree | b10ae1e050fb7e8fec25be7100151f5b142a50c6 /loader2/Makefile | |
| parent | 25a4c15aa61e9113c45a1d5c856296fb1d5b48d9 (diff) | |
| download | anaconda-66ea54b4f1ebe35cd2d38fb9c7b27a42dce4cb4c.tar.gz anaconda-66ea54b4f1ebe35cd2d38fb9c7b27a42dce4cb4c.tar.xz anaconda-66ea54b4f1ebe35cd2d38fb9c7b27a42dce4cb4c.zip | |
Update driver disk code to use the new driver disk repo model (#213318).
Also add Peter's firmware loader from head to support this, and fix driver
disks in general.
Diffstat (limited to 'loader2/Makefile')
| -rw-r--r-- | loader2/Makefile | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/loader2/Makefile b/loader2/Makefile index 63aa872ec..3b93ce332 100644 --- a/loader2/Makefile +++ b/loader2/Makefile @@ -21,12 +21,6 @@ CFLAGS += $(shell pkg-config --cflags libdhcp) LIBS += $(shell pkg-config --libs devmapper) CFLAGS += $(shell pkg-config --cflags devmapper) -ifeq (1, $(USEFWLOADER)) -# nash library flags -LIBS += $(shell pkg-config --libs libnash) -CFLAGS += $(shell pkg-config --cflags libnash) -DNASH_FIRMWARE_LOADER -endif - ifeq (1, $(USESELINUX)) LIBS += -lselinux -lsepol endif @@ -41,7 +35,7 @@ METHOBJS = method.o cdinstall.o hdinstall.o nfsinstall.o urlinstall.o OBJS = log.o moduleinfo.o loadermisc.o modules.o moduledeps.o windows.o \ lang.o kbd.o modstubs.o driverdisk.o selinux.o \ md5.o mediacheck.o kickstart.o driverselect.o \ - getparts.o dirbrowser.o \ + getparts.o dirbrowser.o fwloader.o \ $(HWOBJS) $(METHOBJS) LOADEROBJS = loader.o loader-pcmcia.o NETOBJS = net.o urls.o ftp.o telnet.o telnetd.o @@ -117,7 +111,7 @@ loader-net.o: loader.c $(CC) -DINCLUDE_NETWORK $(CFLAGS) -o $@ -c $< loader: loader.o $(OBJS) $(NETOBJS) - $(CC) -g $(STATIC) -o $@ $^ $(LIBS) + $(CC) -g $(STATIC) -o $@ $^ $(LIBS) $(LDFLAGS) clean: rm -f *.o *~ .depend init ctype.c mkctype \ |