summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2013-11-12 21:28:37 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2013-11-12 21:30:58 +0100
commit6d081422730ada70af4d24c8c84f19c63ee3bd73 (patch)
tree2dcf196148fa7d32a274bc9d2cec2ff60808119c
parent7e4ea2526a7512601c16d468a78f7945059121ed (diff)
downloaddrakx-6d081422730ada70af4d24c8c84f19c63ee3bd73.tar
drakx-6d081422730ada70af4d24c8c84f19c63ee3bd73.tar.gz
drakx-6d081422730ada70af4d24c8c84f19c63ee3bd73.tar.bz2
drakx-6d081422730ada70af4d24c8c84f19c63ee3bd73.tar.xz
drakx-6d081422730ada70af4d24c8c84f19c63ee3bd73.zip
simplify: drop $STAGE1_LIBC
-rw-r--r--mdk-stage1/Makefile10
-rw-r--r--mdk-stage1/Makefile.common2
2 files changed, 5 insertions, 7 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index f1a563575..1f47002f4 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -140,15 +140,15 @@ dirs:
[ "$$n" = "." ] || make -C $$n || exit 1 ;\
done
-init: $(INITOBJS) $(STAGE1_LIBC)
+init: $(INITOBJS)
$(CC) $(LDFLAGS) -o $@ $^
$(STRIPCMD) $@
-stage1: $(STAGE1OBJS-FULL) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB) $(STAGE1_LIBC)
+stage1: $(STAGE1OBJS-FULL) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB)
$(CC) $(LDFLAGS) -o $@ $^
$(STRIPCMD) $@
-dhcp-client: $(STAGE1OBJS-NETWORK-STANDALONE) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(STAGE1_LIBC)
+dhcp-client: $(STAGE1OBJS-NETWORK-STANDALONE) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK)
$(CC) $(LDFLAGS) -o $@ $^
$(STRIPCMD) $@
@@ -178,11 +178,11 @@ localclean:
rm -f *.o .depend *.rdz *.img $(BINS)
-rescue-gui: rescue-gui.o frontend-common.o params.o utils.o log.o automatic.o $(FRONTEND_LINK) $(STAGE1_LIBC)
+rescue-gui: rescue-gui.o frontend-common.o params.o utils.o log.o automatic.o $(FRONTEND_LINK)
$(CC) $(LDFLAGS) -o $@ $^
$(STRIPCMD) $@
-probe-modules: probe-modules.o probing-FULL.o modules-FULL.o params-FULL.o utils-FULL.o log-FULL.o automatic-FULL.o frontend-common-FULL.o stdio-frontend.o zlibsupport-FULL.o $(STAGE1_OWN_LIBS) $(PCMCIA_LIB) $(STAGE1_LIBC)
+probe-modules: probe-modules.o probing-FULL.o modules-FULL.o params-FULL.o utils-FULL.o log-FULL.o automatic-FULL.o frontend-common-FULL.o stdio-frontend.o zlibsupport-FULL.o $(STAGE1_OWN_LIBS) $(PCMCIA_LIB)
$(CC) $(LDFLAGS) -o $@ $^
$(STRIPCMD) $@
diff --git a/mdk-stage1/Makefile.common b/mdk-stage1/Makefile.common
index 188482ae9..629d27619 100644
--- a/mdk-stage1/Makefile.common
+++ b/mdk-stage1/Makefile.common
@@ -48,8 +48,6 @@ INCLUDES = -I.
LDFLAGS =
-STAGE1_LIBC = $($(L)_LIBC)
-
ifdef DEBUG
STRIPCMD = echo not stripping
else