summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Troan <ewt@redhat.com>2000-05-09 16:26:45 +0000
committerErik Troan <ewt@redhat.com>2000-05-09 16:26:45 +0000
commitb085dbf9fa656f8eeefb7eeaa6c532647f1cf388 (patch)
tree4e877f88ec463af51627d5aa361edddcf52f3e3d
parent702e6975d40b891f3a6699c54d5ef5ab9fa62f91 (diff)
downloadanaconda-b085dbf9fa656f8eeefb7eeaa6c532647f1cf388.tar.gz
anaconda-b085dbf9fa656f8eeefb7eeaa6c532647f1cf388.tar.xz
anaconda-b085dbf9fa656f8eeefb7eeaa6c532647f1cf388.zip
fixed dependency crap
-rw-r--r--Makefile4
-rw-r--r--bootdisk/Makefile1
-rw-r--r--collage/Makefile15
-rw-r--r--ddcprobe/Makefile15
-rw-r--r--gnome-map/Makefile2
-rw-r--r--installclasses/Makefile2
-rw-r--r--iw/Makefile2
-rw-r--r--minislang/Makefile15
-rw-r--r--pixmaps/Makefile2
-rw-r--r--po/Makefile2
-rw-r--r--po/anaconda.pot98
-rw-r--r--scripts/Makefile1
-rw-r--r--stubs/Makefile2
-rw-r--r--textw/Makefile2
14 files changed, 114 insertions, 49 deletions
diff --git a/Makefile b/Makefile
index c463f221f..7422e5daf 100644
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,10 @@ xmouse.so: xmouse.c
gcc -Wall -o xmouse.o -fPIC -I/usr/X11R6/include -I/usr/include/python1.5 -I /usr/include/python1.5 -c xmouse.c
gcc -o xmouse.so -shared xmouse.o /usr/X11R6/lib/libXxf86misc.a -L/usr/X11R6/lib -lX11 -lXext
+depend:
+ rm -f *.o *.so *.pyc
+ for d in $(SUBDIRS); do make -C $$d depend; done
+
clean:
rm -f *.o *.so *.pyc
for d in $(SUBDIRS); do make -C $$d clean; done
diff --git a/bootdisk/Makefile b/bootdisk/Makefile
index ef9bd5d41..80b604aa5 100644
--- a/bootdisk/Makefile
+++ b/bootdisk/Makefile
@@ -9,3 +9,4 @@ install:
cp -av $(ARCH)/[a-z]* $(DESTDIR)/$(RUNTIMEDIR)/boot; \
fi
+depend:
diff --git a/collage/Makefile b/collage/Makefile
index b8a645eda..dd9bcc2d1 100644
--- a/collage/Makefile
+++ b/collage/Makefile
@@ -4,6 +4,14 @@ CFLAGS = -Wall -g
LDFLAGS = -g
LOADLIBES = -L../isys -lz -lisys -lresolv -lpopt
+ifeq (.depend,$(wildcard .depend))
+TARGET=all
+else
+TARGET=depend all
+endif
+
+everything: $(TARGET)
+
all: collage
collage: collage.o commands.o idmap.o ls.o
@@ -15,3 +23,10 @@ install:
clean:
rm -f collage *.o
+
+depend:
+ $(CPP) -M $(CFLAGS) *.c > .depend
+
+ifeq (.depend,$(wildcard .depend))
+include .depend
+endif
diff --git a/ddcprobe/Makefile b/ddcprobe/Makefile
index bde30e509..728c17ceb 100644
--- a/ddcprobe/Makefile
+++ b/ddcprobe/Makefile
@@ -2,6 +2,14 @@ CFLAGS=-Wall -O -g# -DDEBUG
TARGETS=ddcprobe svgamodes ddcxinfo modetest libvbe.a
+ifeq (.depend,$(wildcard .depend))
+TARGET=all
+else
+TARGET=depend all
+endif
+
+everything: $(TARGET)
+
all: $(TARGETS)
install: $(TARGETS)
@@ -28,3 +36,10 @@ $(DESTDIR)/usr/lib/libvbe.a:
clean:
$(RM) $(TARGETS) *.o core
+
+depend:
+ $(CPP) -M $(CFLAGS) *.c > .depend
+
+ifeq (.depend,$(wildcard .depend))
+include .depend
+endif
diff --git a/gnome-map/Makefile b/gnome-map/Makefile
index bffce0bf2..f17436dc9 100644
--- a/gnome-map/Makefile
+++ b/gnome-map/Makefile
@@ -20,3 +20,5 @@ timezonemapmodule.so: gnome-map.o gnome-canvas-dot.o timezonemapmodule.o gnome-m
clean:
rm -f gglobe-canvas *.so *.o *~
+
+depend:
diff --git a/installclasses/Makefile b/installclasses/Makefile
index cc7ade87a..256e14c68 100644
--- a/installclasses/Makefile
+++ b/installclasses/Makefile
@@ -10,3 +10,5 @@ install:
clean:
rm -f *.o *.so *.pyc
+
+depend:
diff --git a/iw/Makefile b/iw/Makefile
index 4e5dba065..6bbbee27f 100644
--- a/iw/Makefile
+++ b/iw/Makefile
@@ -10,3 +10,5 @@ install:
clean:
rm -f *.o *.so *.pyc
+
+depend:
diff --git a/minislang/Makefile b/minislang/Makefile
index e4d1dc6b3..4b296c4d8 100644
--- a/minislang/Makefile
+++ b/minislang/Makefile
@@ -5,6 +5,14 @@ OBJS = sldisply.o slerr.o slgetkey.o slmisc.o slsignal.o slsmg.o \
CFLAGS = -fPIC
+ifeq (.depend,$(wildcard .depend))
+TARGET=all
+else
+TARGET=depend all
+endif
+
+everything: $(TARGET)
+
all: libslang.so
libslang.so: $(OBJS)
@@ -15,3 +23,10 @@ clean:
install: libslang.so
install -s libslang.so $(DESTDIR)/$(RUNTIMEDIR)/libslang.so.1
+
+depend:
+ $(CPP) -M $(CFLAGS) *.c > .depend
+
+ifeq (.depend,$(wildcard .depend))
+include .depend
+endif
diff --git a/pixmaps/Makefile b/pixmaps/Makefile
index 696e0f9d5..0ebe44f7b 100644
--- a/pixmaps/Makefile
+++ b/pixmaps/Makefile
@@ -6,3 +6,5 @@ all:
install:
mkdir -p $(DESTDIR)/$(ANACONDADATADIR)/pixmaps
install *.png $(DESTDIR)/$(ANACONDADATADIR)/pixmaps
+
+depend:
diff --git a/po/Makefile b/po/Makefile
index d5a67411f..b1e15124d 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -88,3 +88,5 @@ missing-mixed:
%.mo: %.po
msgfmt -o $@ $<
+
+depend:
diff --git a/po/anaconda.pot b/po/anaconda.pot
index ba690c914..5589690c2 100644
--- a/po/anaconda.pot
+++ b/po/anaconda.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-09 11:04-0400\n"
+"POT-Creation-Date: 2000-05-09 11:55-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -72,11 +72,11 @@ msgstr ""
msgid "Error mounting %s: %s"
msgstr ""
-#: ../gui.py:289 ../gui.py:543
+#: ../gui.py:292 ../gui.py:546
msgid "Next"
msgstr ""
-#: ../gui.py:290 ../gui.py:542 ../libfdisk/newtfsedit.c:1326
+#: ../gui.py:293 ../gui.py:545 ../libfdisk/newtfsedit.c:1326
#: ../libfdisk/newtfsedit.c:1334 ../loader/cdrom.c:34 ../loader/devices.c:85
#: ../loader/devices.c:205 ../loader/devices.c:287 ../loader/lang.c:569
#: ../loader/loader.c:256 ../loader/loader.c:616 ../loader/loader.c:652
@@ -103,46 +103,46 @@ msgstr ""
msgid "Back"
msgstr ""
-#: ../gui.py:291 ../gui.py:547
+#: ../gui.py:294 ../gui.py:550
msgid "Show Help"
msgstr ""
-#: ../gui.py:292 ../gui.py:546
+#: ../gui.py:295 ../gui.py:549
msgid "Hide Help"
msgstr ""
-#: ../gui.py:293 ../gui.py:545
+#: ../gui.py:296 ../gui.py:548
msgid "Finish"
msgstr ""
-#: ../gui.py:296 ../gui.py:573
+#: ../gui.py:299 ../gui.py:576
msgid "Online Help"
msgstr ""
-#: ../gui.py:297 ../iw/language_gui.py:10 ../text.py:61 ../text.py:880
-#: ../text.py:909
+#: ../gui.py:300 ../iw/language_gui.py:10 ../text.py:61 ../text.py:884
+#: ../text.py:913
msgid "Language Selection"
msgstr ""
-#: ../gui.py:509
+#: ../gui.py:512
msgid "Red Hat Linux Installer"
msgstr ""
-#: ../gui.py:513
+#: ../gui.py:516
msgid "Red Hat Linux Install Shell"
msgstr ""
-#: ../gui.py:524
+#: ../gui.py:527
#, c-format
msgid "Red Hat Linux Installer on %s"
msgstr ""
-#: ../gui.py:525
+#: ../gui.py:528
#, c-format
msgid "Red Hat Linux Install Shell on %s"
msgstr ""
-#: ../gui.py:620
+#: ../gui.py:623
msgid "Install Window"
msgstr ""
@@ -220,7 +220,7 @@ msgstr ""
#: ../loader/urls.c:370 ../text.py:139 ../text.py:192 ../text.py:261
#: ../text.py:321 ../text.py:368 ../text.py:386 ../text.py:428 ../text.py:456
#: ../text.py:530 ../text.py:555 ../text.py:575 ../text.py:779 ../text.py:805
-#: ../text.py:830 ../text.py:834 ../text.py:1040 ../textw/bootdisk_text.py:59
+#: ../text.py:830 ../text.py:834 ../text.py:1044 ../textw/bootdisk_text.py:59
#: ../textw/bootdisk_text.py:71 ../textw/lilo_text.py:30
#: ../textw/lilo_text.py:87 ../textw/lilo_text.py:138
#: ../textw/network_text.py:93 ../textw/network_text.py:114
@@ -252,7 +252,7 @@ msgstr ""
msgid "Mouse Selection"
msgstr ""
-#: ../text.py:190 ../text.py:882 ../text.py:911
+#: ../text.py:190 ../text.py:886 ../text.py:915
msgid "Keyboard Selection"
msgstr ""
@@ -264,7 +264,7 @@ msgstr ""
msgid "Upgrade Existing Installation"
msgstr ""
-#: ../text.py:259 ../text.py:914
+#: ../text.py:259 ../text.py:918
msgid "Installation Type"
msgstr ""
@@ -490,131 +490,131 @@ msgid ""
"screen"
msgstr ""
-#: ../iw/welcome_gui.py:11 ../iw/welcome_gui.py:38 ../text.py:878
-#: ../text.py:913
+#: ../iw/welcome_gui.py:11 ../iw/welcome_gui.py:38 ../text.py:882
+#: ../text.py:917
msgid "Welcome"
msgstr ""
-#: ../text.py:884 ../text.py:952
+#: ../text.py:888 ../text.py:956
msgid "Hostname Setup"
msgstr ""
-#: ../text.py:886 ../text.py:954
+#: ../text.py:890 ../text.py:958
msgid "Network Setup"
msgstr ""
-#: ../text.py:892 ../text.py:960
+#: ../text.py:896 ../text.py:964
msgid "Time Zone Setup"
msgstr ""
-#: ../text.py:894 ../text.py:962 ../textw/userauth_text.py:9
+#: ../text.py:898 ../text.py:966 ../textw/userauth_text.py:9
msgid "Root Password"
msgstr ""
-#: ../text.py:896 ../text.py:964 ../textw/userauth_text.py:169
+#: ../text.py:900 ../text.py:968 ../textw/userauth_text.py:169
msgid "User Account Setup"
msgstr ""
-#: ../text.py:898 ../text.py:966
+#: ../text.py:902 ../text.py:970
msgid "Authentication"
msgstr ""
-#: ../text.py:904
+#: ../text.py:908
msgid "Configuration Complete"
msgstr ""
-#: ../text.py:922 ../textw/silo_text.py:28 ../textw/silo_text.py:100
+#: ../text.py:926 ../textw/silo_text.py:28 ../textw/silo_text.py:100
#: ../textw/silo_text.py:212
msgid "SILO Configuration"
msgstr ""
-#: ../text.py:928 ../textw/lilo_text.py:33 ../textw/lilo_text.py:84
+#: ../text.py:932 ../textw/lilo_text.py:33 ../textw/lilo_text.py:84
#: ../textw/lilo_text.py:199
msgid "LILO Configuration"
msgstr ""
#: ../iw/lilo_gui.py:124 ../iw/lilo_gui.py:247 ../iw/silo_gui.py:127
-#: ../iw/silo_gui.py:279 ../text.py:932 ../text.py:938
+#: ../iw/silo_gui.py:279 ../text.py:936 ../text.py:942
msgid "Partition"
msgstr ""
-#: ../text.py:934
+#: ../text.py:938
msgid "Manually Partition"
msgstr ""
-#: ../text.py:936
+#: ../text.py:940
msgid "Automatic Partition"
msgstr ""
-#: ../text.py:940 ../textw/partitioning_text.py:281
+#: ../text.py:944 ../textw/partitioning_text.py:281
msgid "Root Filesystem Size"
msgstr ""
-#: ../text.py:942
+#: ../text.py:946
msgid "Swap"
msgstr ""
-#: ../text.py:944
+#: ../text.py:948
msgid "Filesystem Formatting"
msgstr ""
-#: ../iw/mouse_gui.py:56 ../text.py:956 ../text.py:958
+#: ../iw/mouse_gui.py:56 ../text.py:960 ../text.py:962
msgid "Mouse Configuration"
msgstr ""
-#: ../text.py:968
+#: ../text.py:972
msgid "Package Groups"
msgstr ""
-#: ../text.py:970 ../text.py:998
+#: ../text.py:974 ../text.py:1002
msgid "Individual Packages"
msgstr ""
-#: ../text.py:972 ../textw/packages_text.py:260
+#: ../text.py:976 ../textw/packages_text.py:260
msgid "Package Dependencies"
msgstr ""
-#: ../iw/xconfig_gui.py:250 ../text.py:974 ../text.py:982
+#: ../iw/xconfig_gui.py:250 ../text.py:978 ../text.py:986
msgid "X Configuration"
msgstr ""
-#: ../text.py:976
+#: ../text.py:980
msgid "Installation Begins"
msgstr ""
-#: ../text.py:978
+#: ../text.py:982
msgid "Install System"
msgstr ""
-#: ../text.py:979 ../text.py:981 ../text.py:1000 ../text.py:1002
+#: ../text.py:983 ../text.py:985 ../text.py:1004 ../text.py:1006
msgid "Boot Disk"
msgstr ""
-#: ../text.py:984
+#: ../text.py:988
msgid "Installation Complete"
msgstr ""
-#: ../text.py:989
+#: ../text.py:993
msgid "Examine System"
msgstr ""
-#: ../text.py:996
+#: ../text.py:1000
msgid "Customize Upgrade"
msgstr ""
-#: ../text.py:999
+#: ../text.py:1003
msgid "Upgrade System"
msgstr ""
-#: ../text.py:1003
+#: ../text.py:1007
msgid "Upgrade Complete"
msgstr ""
-#: ../text.py:1037
+#: ../text.py:1041
msgid "Cancelled"
msgstr ""
-#: ../text.py:1038
+#: ../text.py:1042
msgid "I can't go to the previous step from here. You will have to try again."
msgstr ""
diff --git a/scripts/Makefile b/scripts/Makefile
index 9a28b716a..979698b88 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -7,3 +7,4 @@ install:
install -m 755 mk-images* $(DESTDIR)/$(RUNTIMEDIR)
install -m 755 buildinstall $(DESTDIR)/$(RUNTIMEDIR)
+depend:
diff --git a/stubs/Makefile b/stubs/Makefile
index 99ecbdca4..05e763054 100644
--- a/stubs/Makefile
+++ b/stubs/Makefile
@@ -10,3 +10,5 @@ clean:
install:
install libbz2.so.0 $(DESTDIR)/$(RUNTIMEDIR)
+
+depend:
diff --git a/textw/Makefile b/textw/Makefile
index a61aaa3f7..0a27cc6c7 100644
--- a/textw/Makefile
+++ b/textw/Makefile
@@ -10,3 +10,5 @@ install:
clean:
rm -f *.o *.so *.pyc
+
+depend: