aboutsummaryrefslogtreecommitdiff
path: root/scripts/config
diff options
context:
space:
mode:
authoraldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-03-13 19:04:00 +0000
committeraldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-03-13 19:04:00 +0000
commit30d77f4b561efa82d87b1767281a687c72f78dc4 (patch)
tree49493696039b285aa751a5bc884fc70c9c85e878 /scripts/config
parent12f32660d14e442e42ed667c106fec3a9db79856 (diff)
downloadbusybox-w32-30d77f4b561efa82d87b1767281a687c72f78dc4.tar.gz
busybox-w32-30d77f4b561efa82d87b1767281a687c72f78dc4.tar.bz2
busybox-w32-30d77f4b561efa82d87b1767281a687c72f78dc4.zip
- revert back to r14406
git-svn-id: svn://busybox.net/trunk/busybox@14531 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'scripts/config')
-rw-r--r--scripts/config/Makefile10
1 files changed, 4 insertions, 6 deletions
diff --git a/scripts/config/Makefile b/scripts/config/Makefile
index 716e130da..4c966f7a6 100644
--- a/scripts/config/Makefile
+++ b/scripts/config/Makefile
@@ -2,12 +2,8 @@
2# 2#
3# Copyright (C) 2002 Erik Andersen <andersen@codepoet.org> 3# Copyright (C) 2002 Erik Andersen <andersen@codepoet.org>
4 4
5ifndef top_srcdir
6top_srcdir=../.. 5top_srcdir=../..
7endif
8ifndef top_builddir
9top_builddir=../.. 6top_builddir=../..
10endif
11srcdir=$(top_srcdir)/scripts/config 7srcdir=$(top_srcdir)/scripts/config
12include $(top_srcdir)/Rules.mak 8include $(top_srcdir)/Rules.mak
13 9
@@ -54,10 +50,12 @@ MCONF_OBJS = $(patsubst %.c,%.o, $(MCONF_SRC) $(LXD_SRC))
54SHARED_OBJS = $(patsubst %.c,%.o, $(SHARED_SRC)) 50SHARED_OBJS = $(patsubst %.c,%.o, $(SHARED_SRC))
55 51
56conf: $(CONF_OBJS) $(SHARED_OBJS) 52conf: $(CONF_OBJS) $(SHARED_OBJS)
57 $(do_link.h) 53 $(SECHO) " "HOSTCC $@ ; true
54 $(Q)$(HOSTCC) $(NATIVE_LDFLAGS) $^ -o $@
58 55
59mconf: $(MCONF_OBJS) $(SHARED_OBJS) 56mconf: $(MCONF_OBJS) $(SHARED_OBJS)
60 $(do_link.h) $(LIBS) 57 $(SECHO) " "HOSTCC $@ ; true
58 $(Q)$(HOSTCC) $(NATIVE_LDFLAGS) $^ -o $@ $(LIBS)
61 59
62$(CONF_OBJS): %.o : $(srcdir)/%.c $(SHARED_DEPS) 60$(CONF_OBJS): %.o : $(srcdir)/%.c $(SHARED_DEPS)
63 $(compile.h) -I. 61 $(compile.h) -I.