diff options
| author | Rob Landley <rob@landley.net> | 2006-05-08 18:18:02 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-05-08 18:18:02 +0000 |
| commit | d61b8d8f9b055dc9341e8e5a9a329adb10c29fc7 (patch) | |
| tree | ab4474774325ebd3ded7a8e822c4644d7b73dd23 /Rules.mak | |
| parent | 19802563ed14d75674ba863ee2b5ec29df539abb (diff) | |
The changes svn 14960 made to Rules.mak broke building out of tree
(with O=directory), and reverting them fixes building out of tree. I'd be
happy to fix them up instead of reverting them if I had the foggiest idea
what they were trying to do, but I don't, and this at least gets building
out of tree working again...
Diffstat (limited to 'Rules.mak')
| -rw-r--r-- | Rules.mak | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -300,28 +300,24 @@ pur_disp_compile.c = echo " "CC $(show_objs) pur_disp_compile.h = echo " "HOSTCC $(show_objs) pur_disp_strip = echo " "STRIP $(show_objs) pur_disp_link = echo " "LINK $(show_objs) -pur_disp_link.h = echo " "HOSTLINK $(show_objs) pur_disp_ar = echo " "AR $(ARFLAGS) $(show_objs) pur_disp_elf2flt = echo " "ELF2FLT $(ELF2FLTFLAGS) $(show_objs) sil_disp_compile.c = true sil_disp_compile.h = true sil_disp_strip = true sil_disp_link = true -sil_disp_link.h = true sil_disp_ar = true sil_disp_elf2flt = true ver_disp_compile.c = echo $(cmd_compile.c) ver_disp_compile.h = echo $(cmd_compile.h) ver_disp_strip = echo $(cmd_strip) ver_disp_link = echo $(cmd_link) -ver_disp_link.h = echo $(cmd_link.h) ver_disp_ar = echo $(cmd_ar) ver_disp_elf2flt = echo $(cmd_elf2flt) disp_compile.c = $($(DISP)_disp_compile.c) disp_compile.h = $($(DISP)_disp_compile.h) disp_strip = $($(DISP)_disp_strip) disp_link = $($(DISP)_disp_link) -disp_link.h = $($(DISP)_disp_link.h) disp_ar = $($(DISP)_disp_ar) disp_gen = $(SECHO) " "GEN $@ ; true disp_doc = $(SECHO) " "DOC $(subst docs/,,$@) ; true @@ -330,14 +326,12 @@ cmd_compile.c = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< cmd_compile.h = $(HOSTCC) $(HOSTCFLAGS) -c -o $@ $< cmd_strip = $(STRIPCMD) $@ cmd_link = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) -cmd_link.h = $(HOSTCC) $(HOSTCFLAGS) $< -o $@ cmd_ar = $(AR) $(ARFLAGS) $@ $^ cmd_elf2flt = $(ELF2FLT) $(ELF2FLTFLAGS) $< -o $@ compile.c = @$(disp_compile.c) ; $(cmd_compile.c) compile.h = @$(disp_compile.h) ; $(cmd_compile.h) do_strip = @$(disp_strip) ; $(cmd_strip) do_link = @$(disp_link) ; $(cmd_link) -do_link.h = @$(disp_link.h) ; $(cmd_link.h) do_ar = @$(disp_ar) ; $(cmd_ar) do_elf2flt = @$(disp_elf2flt) ; $(cmd_elf2flt) |