summaryrefslogtreecommitdiff
path: root/Makerules
diff options
context:
space:
mode:
authorAustin Foxley <austinf@cetoncorp.com>2010-04-14 11:08:37 -0700
committerAustin Foxley <austinf@cetoncorp.com>2010-04-14 11:08:44 -0700
commite035abf89fbe11a88a26372f1695c768aff7d9e1 (patch)
tree5ea3b4a66e223ede91ad4073bab7081afbfd560e /Makerules
parent9ed510ad034f9327e7e032d2c6550bfb1f750eb9 (diff)
parent718dcdc32bc831b2c141b020124501515afb9adc (diff)
Merge commit 'origin/master' into nptl
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'Makerules')
-rw-r--r--Makerules19
1 files changed, 9 insertions, 10 deletions
diff --git a/Makerules b/Makerules
index af95ca0f9..1bc059e29 100644
--- a/Makerules
+++ b/Makerules
@@ -309,20 +309,19 @@ endef
CFLAGS-.os+=$(PICFLAG)
CFLAGS-.oS+=$(PICFLAG) -DSHARED
-$(top_srcdir)%.i: | pregen
$(top_builddir)%.o: $(top_srcdir)%.c FORCE ; $(compile.c)
-$(top_builddir)%.os: $(top_srcdir)%.c FORCE ; $(compile.c)
-$(top_builddir)%.oS: $(top_srcdir)%.c FORCE ; $(compile.c)
+$(top_builddir)%.os: $(top_srcdir)%.c FORCE | pregen; $(compile.c)
+$(top_builddir)%.oS: $(top_srcdir)%.c FORCE | pregen; $(compile.c)
$(top_builddir)%.o: $(top_srcdir)%.S FORCE ; $(compile.S)
-$(top_builddir)%.os: $(top_srcdir)%.S FORCE ; $(compile.S)
-$(top_builddir)%.oS: $(top_srcdir)%.S FORCE ; $(compile.S)
+$(top_builddir)%.os: $(top_srcdir)%.S FORCE | pregen; $(compile.S)
+$(top_builddir)%.oS: $(top_srcdir)%.S FORCE | pregen; $(compile.S)
$(top_builddir)%.o: $(top_srcdir)%.s FORCE ; $(compile.S)
$(top_builddir)%.os: $(top_srcdir)%.s FORCE ; $(compile.S)
-$(top_builddir)%.oS: $(top_srcdir)%.s FORCE ; $(compile.S)
-$(top_builddir)%.i: $(top_srcdir)%.c FORCE ; $(compile.i)
-$(top_builddir)%.i: $(top_srcdir)%.S FORCE ; $(compile.i)
-$(top_builddir)%.s: $(top_srcdir)%.c FORCE ; $(compile.s)
-$(top_builddir)%.s: $(top_srcdir)%.S FORCE ; $(compile.s)
+$(top_builddir)%.oS: $(top_srcdir)%.s FORCE | pregen; $(compile.S)
+$(top_builddir)%.i: $(top_srcdir)%.c FORCE | pregen; $(compile.i)
+$(top_builddir)%.i: $(top_srcdir)%.S FORCE | pregen; $(compile.i)
+$(top_builddir)%.s: $(top_srcdir)%.c FORCE | pregen; $(compile.s)
+$(top_builddir)%.s: $(top_srcdir)%.S FORCE | pregen; $(compile.s)
$(top_builddir)%.dep:
$(top_builddir)lib/interp.c: | $(sub_headers)