diff options
author | Andrew Waterman <waterman@cs.berkeley.edu> | 2013-04-24 21:23:54 -0700 |
---|---|---|
committer | Andrew Waterman <waterman@cs.berkeley.edu> | 2013-04-24 21:23:54 -0700 |
commit | 14cfc50a602a38e8d428f73526d8e6bcbdf59793 (patch) | |
tree | 26c08fda4ca3670957a6b584bbf689cad6ce1956 /Makefile.in | |
parent | adb3e3df44f6a3288d957ec2a256eb2b2c02821f (diff) | |
download | spike-14cfc50a602a38e8d428f73526d8e6bcbdf59793.zip spike-14cfc50a602a38e8d428f73526d8e6bcbdf59793.tar.gz spike-14cfc50a602a38e8d428f73526d8e6bcbdf59793.tar.bz2 |
fix(?) circular dependence on generated headers
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 2630dc4..b6c0187 100644 --- a/Makefile.in +++ b/Makefile.in @@ -197,7 +197,7 @@ $(2)_objs := $$(patsubst %.cc, %.o, $$($(2)_srcs)) $(2)_c_objs := $$(patsubst %.c, %.o, $$($(2)_c_srcs)) $(2)_deps := $$(patsubst %.o, %.d, $$($(2)_objs)) $(2)_c_deps := $$(patsubst %.o, %.d, $$($(2)_c_objs)) -$$($(2)_objs) : %.o : %.cc +$$($(2)_objs) : %.o : %.cc $(2)_gen_hdrs $(COMPILE) -c $$< $$($(2)_c_objs) : %.o : %.c $(COMPILE_C) -c $$< @@ -298,13 +298,13 @@ clean-$(1) : libs += lib$(1).a objs += $$($(2)_objs) srcs += $$(addprefix $(src_dir)/$(1)/, $$($(2)_srcs)) -hdrs += $$(addprefix $(src_dir)/$(1)/, $$($(2)_hdrs)) +hdrs += $$(addprefix $(src_dir)/$(1)/, $$($(2)_hdrs) $$($(2)_gen_hdrs)) junk += $$($(2)_junk) deps += $$($(2)_deps) test_outs += $$($(2)_test_outs) -install_hdrs += $$(addprefix $(src_dir)/$(1)/, $$($(2)_hdrs)) +install_hdrs += $$(addprefix $(src_dir)/$(1)/, $$($(2)_hdrs) $$($(2)_gen_hdrs)) install_libs += lib$(1).a install_exes += $$($(2)_install_prog_exes) |