diff options
| author | David Cantrell <dcantrell@redhat.com> | 2006-07-26 21:27:11 +0000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2006-07-26 21:27:11 +0000 |
| commit | af9c49fa0485c76ebeb0b2dd560effccd3821751 (patch) | |
| tree | fcac21399ac629cff537b38fb4d67e1c0f48ebe9 /loader2/Makefile | |
| parent | af6c15155a36f2ee5eace7fa88c2ec2daa8c9e16 (diff) | |
| download | anaconda-af9c49fa0485c76ebeb0b2dd560effccd3821751.tar.gz anaconda-af9c49fa0485c76ebeb0b2dd560effccd3821751.tar.xz anaconda-af9c49fa0485c76ebeb0b2dd560effccd3821751.zip | |
* loader2/urls.c (urlinstStartTransfer): Determine address family
and pass that to the ftpOpen() call.
* urlinstall.py (UrlInstallMethod.__init__): Use urlparse.
* isys/dns.c, isys/dns.h: Updated for IPv6 support.
* loader2/Makefile: Cleanups.
* loader2/ftp.c, loader2/ftp.h: Updated for IPv6 support.
* loader2/loader.c: Whitespace consistency.
* loader2/method.c: Whitespace consistency.
* loader2/urls.c: Updated for IPv6 support.
Diffstat (limited to 'loader2/Makefile')
| -rw-r--r-- | loader2/Makefile | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/loader2/Makefile b/loader2/Makefile index 7cafd9434..f69594fd1 100644 --- a/loader2/Makefile +++ b/loader2/Makefile @@ -7,27 +7,27 @@ else TARGET=depend $(PROGS) endif +LIBS = -lnewt -lslang -lz -ldevmapper -lpopt ../isys/libisys.a + # glib - for utility stuff -GLIB = $(shell pkg-config --libs glib-2.0) +LIBS += $(shell pkg-config --libs glib-2.0) CFLAGS += $(shell pkg-config --cflags glib-2.0) # dhcp library flags -DHCP = $(shell pkg-config --libs libdhcp) +LIBS += $(shell pkg-config --libs libdhcp) CFLAGS += $(shell pkg-config --cflags libdhcp) # nash library flags -NASH = $(shell pkg-config --libs libnash) +LIBS += $(shell pkg-config --libs libnash) CFLAGS += $(shell pkg-config --cflags libnash) -SLANGLIB = -lslang -NEWTLIB = -lnewt -ISYSLIB = ../isys/libisys.a -GUNZIP = -lz -DMLIB = -ldevmapper ifeq (1, $(USESELINUX)) -DMLIB += -lselinux -lsepol +LIBS += -lselinux -lsepol endif +# These libs need to be on the end of the link list +LIBS += -lresolv -lm + BINS = loader HWOBJS = pcmcia.o usb.o firewire.o hardware.o @@ -42,7 +42,7 @@ NETOBJS = net.o urls.o ftp.o telnet.o telnetd.o PCMCIAOBJS = pcmcia.o $(NETOBJS) SOURCES = $(subst .o,.c,$(OBJS)) loader.c -HWLIBS = -lkudzu_loader -lpci +LIBS += -lkudzu_loader -lpci # NSS linker flags NSSFLAGS = -Wl,-rpath-link,/nss @@ -51,7 +51,7 @@ CFLAGS += -DUSE_LOGDEV -DVERSION='"$(VERSION)"' STATIC = -static REALCC=gcc -UNICODELIB = ../stubs/libunicode-lite.a ../wlite/libwlite.a +LIBS += ../stubs/libunicode-lite.a ../wlite/libwlite.a # linuxrc + shutdown on s390, init everywhere else ifneq (,$(filter s390 s390x,$(ARCH))) @@ -114,9 +114,7 @@ loader-net.o: loader.c $(CC) -DINCLUDE_NETWORK $(CFLAGS) -o $@ -c $< loader: loader.o $(OBJS) $(NETOBJS) - $(CC) -g $(STATIC) $(NSSFLAGS) -o $@ $^ -lpopt \ - $(HWLIBS) $(ISYSLIB) $(GUNZIP) $(UNICODELIB) \ - -lresolv $(NEWTLIB) $(SLANGLIB) $(DMLIB) $(GLIB) $(DHCP) $(NASH) -lm + $(CC) -g $(STATIC) $(NSSFLAGS) -o $@ $^ $(LIBS) clean: rm -f *.o *~ .depend init ctype.c mkctype \ |