diff options
| author | Matt Wilson <msw@redhat.com> | 1999-09-11 16:57:04 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 1999-09-11 16:57:04 +0000 |
| commit | cb2e0115a82f04aff14bc5f22d7c7f417df9cc7c (patch) | |
| tree | fa0bb4ccb7faec0505789f2eca15e2a0556b75ef /loader | |
| parent | ec0a82a9f0ebfbfa97df65b9637f1e32068b1dd0 (diff) | |
| download | anaconda-cb2e0115a82f04aff14bc5f22d7c7f417df9cc7c.tar.gz anaconda-cb2e0115a82f04aff14bc5f22d7c7f417df9cc7c.tar.xz anaconda-cb2e0115a82f04aff14bc5f22d7c7f417df9cc7c.zip | |
more kanji stuff
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/Makefile | 15 | ||||
| -rw-r--r-- | loader/kon2/Makefile | 5 | ||||
| -rw-r--r-- | loader/loader.c | 4 |
3 files changed, 13 insertions, 11 deletions
diff --git a/loader/Makefile b/loader/Makefile index 7e3697670..39ddc2dca 100644 --- a/loader/Makefile +++ b/loader/Makefile @@ -1,3 +1,5 @@ +VERSION = 6.0 + DESTDIR = ../../trees/initrd ARCH := $(patsubst i%86,i386,$(shell uname -m)) @@ -11,6 +13,9 @@ DIRS = NETOBJS = net.o KON = 1 PCMCIAOBJS = pcmcia.o $(NETOBJS) +OPTS = -O2 -g + +CFLAGS = $(DEBUG) $(OPTS) -Wall -D_GNU_SOURCE=1 -I/usr/include/rpm -I.. -DUSE_ALT_DNS=1 -DVERSION='"$(VERSION)"' ALLOBJS = $(OBJS) $(PCMCIAOBJS) @@ -21,7 +26,9 @@ OBJS += stubs.o endif ifeq (1, $(KON)) +DIRS += kon2 OBJS += ./kon2/src/libkon.a ./kon2/src/display.a ./kon2/lib/libgon.a +CFLAGS += -DINCLUDE_KON=1 endif ifeq (alpha, $(ARCH)) @@ -39,10 +46,6 @@ else TARGET=depend $(PROGS) endif -OPTS = -O2 -g - -CFLAGS = $(DEBUG) $(OPTS) -Wall -D_GNU_SOURCE=1 -I/usr/include/rpm -I.. -DUSE_ALT_DNS=1 -DVERSION='"$(VERSION)"' - STATIC = -static ifeq (i386, $(ARCH)) @@ -62,13 +65,11 @@ STATIC=-static endif endif -VERSION = 6.0 - all: dirs $(BINS) dirs: for n in $(DIRS); do \ - cd $$n; make; \ + (cd $$n; make -n) \ done install: all diff --git a/loader/kon2/Makefile b/loader/kon2/Makefile index f295779d4..783f988e1 100644 --- a/loader/kon2/Makefile +++ b/loader/kon2/Makefile @@ -7,7 +7,7 @@ endif INCDIR = $(shell pwd)/include LIB = $(shell pwd)/lib/libgon.a -MAKEFLAGS = INCDIR=$(INCDIR) LIB=$(LIB) +MFLAGS = INCDIR=$(INCDIR) LIB=$(LIB) ifdef MINI_KON SUBDIRS = lib src @@ -29,8 +29,9 @@ config: cp Makefile.linux Makefile subdirs: + echo $(MFLAGS) @for i in $(SUBDIRS);\ - do (cd $$i && echo making all in $$i && $(MAKE) $(MAKEFLAGS)) || exit;\ + do (cd $$i && echo making all in $$i && $(MAKE) $(MFLAGS)) || exit;\ done depend: diff --git a/loader/loader.c b/loader/loader.c index 086f60c4c..1c59f2544 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1386,12 +1386,12 @@ int main(int argc, char ** argv) { return ourInsmodCommand(argc, argv); #ifdef INCLUDE_KON - if (!strcmp(argv[0] + strlen(argv[0]) - 3, "kon")) + else if (!strcmp(argv[0] + strlen(argv[0]) - 3, "kon")) return kon_main(argc, argv); #endif #ifdef INCLUDE_PCMCIA - if (!strcmp(argv[0] + strlen(argv[0]) - 7, "cardmgr")) + else if (!strcmp(argv[0] + strlen(argv[0]) - 7, "cardmgr")) return cardmgr_main(argc, argv); else if (!strcmp(argv[0] + strlen(argv[0]) - 5, "probe")) return probe_main(argc, argv); |