diff options
author | Jeremy Katz <katzj@redhat.com> | 2006-02-22 20:00:32 +0000 |
---|---|---|
committer | Jeremy Katz <katzj@redhat.com> | 2006-02-22 20:00:32 +0000 |
commit | 44eb3dd9f9488ebe6f214a328a8c55d7d3c73cf8 (patch) | |
tree | adf919bcfc3d3dfc4d1297a350a6b7ee307aceca /loader2/Makefile | |
parent | da4e01fa60d0b0b0844e194e8cde5d32800b56d1 (diff) | |
download | anaconda-44eb3dd9f9488ebe6f214a328a8c55d7d3c73cf8.tar.gz anaconda-44eb3dd9f9488ebe6f214a328a8c55d7d3c73cf8.tar.xz anaconda-44eb3dd9f9488ebe6f214a328a8c55d7d3c73cf8.zip |
2006-02-22 Jeremy Katz <katzj@redhat.com>
* lang-table: Set all previously bterm using languages to "none"
for the fact that we can't handle them in text-mode anymore
* textw/language_text.py (LanguageWindow.__call__): Remove bterm
special-casing.
* text.py (InstallInterface.run): Likewise.
* loader2/lang.c (setupLanguage): Likewise.
* language.py (Language.fixLang): No more "bterm" font
* stubs/unicode-lite.c: Don't require wlite
* stubs/Makefile: Don't link against wlite
* loader2/Makefile: No more linking to bterm here either
* isys/lang.c: Remove bterm support code.
* isys/lang.h: And declaration.
* isys/Makefile (LOADLIBES): No more linking to bterm
* isys/isys.c (start_bterm): Remove this
* anaconda.spec (BuildPreReq): Bye-bye bogl
Diffstat (limited to 'loader2/Makefile')
-rw-r--r-- | loader2/Makefile | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/loader2/Makefile b/loader2/Makefile index 9e28934e4..0492e7eac 100644 --- a/loader2/Makefile +++ b/loader2/Makefile @@ -9,8 +9,6 @@ endif SLANGLIB = -lslang NEWTLIB = -lnewt -BTERMLIB = -lbterm -lbogl -WLITELIB = -lwlite ISYSLIB = ../isys/libisys.a GUNZIP = -lz DMLIB = -ldevmapper -lselinux -lsepol @@ -44,8 +42,6 @@ ifeq (1, $(USEDIET)) CFLAGS += -DGZLIB=1 -DDIET=1 DIET=diet CC=$(DIET) $(REALCC) -BTERMLIB = -lbtermdiet -lbogldiet -WLITELIB = -lwlitediet ISYSLIB = ../isys/libisys-diet.a GUNZIP = ../isys/gzlib/libgunzip-diet.a @@ -70,14 +66,7 @@ LANGS = $(shell cut -f 2 ../lang-table | egrep -v '(^en$$)') TR = $(patsubst %,tr/%.tr,$(LANGS)) TRFILES = $(patsubst %,%.tr,$(LANGS)) -all: $(BINS) loader.tr font.bgf.gz - -font.bgf.gz: /usr/lib/bogl/font.bdf.gz /usr/bin/reduce-font unicode-linedraw-chars.txt - zcat /usr/lib/bogl/font.bdf.gz > font.bdf - export LANG=en_US.UTF-8; (cat unicode-linedraw-chars.txt; for I in ../po/*.po ../po/timeconfig/*.po ; do msgconv -t utf-8 $$I; done) | reduce-font font.bdf > font-reduced.bdf - bdftobogl -b font-reduced.bdf > font.bgf - rm -f font.bdf font-reduced.bdf - gzip -9 -f font.bgf +all: $(BINS) loader.tr loader.tr: $(TR) ../lang-table (cd tr; ls $(TRFILES) | cpio --quiet -Hcrc -o |gzip -9) > $@ @@ -126,7 +115,7 @@ loader-net.o: loader.c loader: loader.o $(OBJS) $(NETOBJS) $(CC) -g $(STATIC) -o $@ $^ -lpopt \ $(HWLIBS) $(ISYSLIB) $(GUNZIP) $(UNICODELIB) \ - -lpump -lresolv $(NEWTLIB) $(SLANGLIB) $(BTERMLIB) $(WLITELIB) $(DMLIB) + -lpump -lresolv $(NEWTLIB) $(SLANGLIB) $(DMLIB) clean: rm -f *.o *~ .depend init ctype.c mkctype \ @@ -151,7 +140,6 @@ install: all install -m 644 unicode-linedraw-chars.txt $(DESTDIR)/$(RUNTIMEDIR)/loader install -m 644 loader.tr $(DESTDIR)/$(RUNTIMEDIR)/loader install -m 644 module-info $(DESTDIR)/$(RUNTIMEDIR)/loader - install -m 644 font.bgf.gz $(DESTDIR)/$(RUNTIMEDIR)/loader dirbrowser: dirbrowser.c gcc -DSTANDALONE -D_FORTIFY_SOURCE=2 -Wall -Werror -ggdb -o dirbrowser dirbrowser.c -lnewt -lslang |