diff options
| author | David Cantrell <dcantrell@redhat.com> | 2006-06-07 16:57:43 +0000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2006-06-07 16:57:43 +0000 |
| commit | c85ea27bcb69bebcf442669965b0365abd316669 (patch) | |
| tree | 9176f64187e9aac3159cf55eb96d03cc6da86497 /loader2/Makefile | |
| parent | 6538c06ec4c08fab71e1a1a33f77edb2cd085c28 (diff) | |
| download | anaconda-c85ea27bcb69bebcf442669965b0365abd316669.tar.gz anaconda-c85ea27bcb69bebcf442669965b0365abd316669.tar.xz anaconda-c85ea27bcb69bebcf442669965b0365abd316669.zip | |
HERE COMES YOUR WATER! ....
Ok, so what exactly are we looking at here? A slapped-together pile of stuff that uses libdhcp instead of pump. I call it a work in progress. Right now we have support for regular IPv4-based installs. IPv6 is sort-of halfway there. I'm still wedging it in to place (i.e., dodging sigsegvs). I wanted to get an IPv4-libdhcp-move committed now so that it's in CVS. The pump-compatible API in libdhcp is mostly useless, so I'm moving things from using the core-dumping pump API functions to just using the libdhcp stuff directly. I had to back out a lot of IPv6 stuff I did in the interim.
Please avoid making huge changes to the loader2 network code because I'm still tearing through that.
Diffstat (limited to 'loader2/Makefile')
| -rw-r--r-- | loader2/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/loader2/Makefile b/loader2/Makefile index 60b58eef8..973282174 100644 --- a/loader2/Makefile +++ b/loader2/Makefile @@ -7,9 +7,14 @@ else TARGET=depend $(PROGS) endif +# glib - for utility stuff GLIB = $(shell pkg-config --libs glib-2.0) CFLAGS += $(shell pkg-config --cflags glib-2.0) +# dhcp library flags +DHCP = $(shell pkg-config --libs libdhcp) +CFLAGS += $(shell pkg-config --cflags libdhcp) + SLANGLIB = -lslang NEWTLIB = -lnewt ISYSLIB = ../isys/libisys.a @@ -121,7 +126,7 @@ loader-net.o: loader.c loader: loader.o $(OBJS) $(NETOBJS) $(CC) -g $(STATIC) -o $@ $^ -lpopt \ $(HWLIBS) $(ISYSLIB) $(GUNZIP) $(UNICODELIB) \ - -lpump -lresolv $(NEWTLIB) $(SLANGLIB) $(DMLIB) $(GLIB) + -lresolv $(NEWTLIB) $(SLANGLIB) $(DMLIB) $(GLIB) $(DHCP) -lm clean: rm -f *.o *~ .depend init ctype.c mkctype \ |