sim: ppc: avoid use of $< in ordinary rules [PR sim/13834]

POSIX does not define $< behavior in ordinary rules, so avoid its use
to fix building on non-GNU make setups.

Reported-by: Christopher January <chris.january@allinea.com>

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 24fcbb8030e81701a430b99306e187fa470850fc..9d85c4c61099bdeae08f68b457cc01c3737bbe8a 100644 (file)
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,10 @@
+2015-11-21  Mike Frysinger  <vapier@gentoo.org>
+
+       PR sim/13834
+       * Makefile.in (gentmap): Change $< to $(srcdir)/../common/gentmap.c.
+       (callback.o): Change $< to $(srcdir)/../common/callback.c.
+       (options.o): Change $< to $(srcdir)/options.c.
+
 2015-11-17  Pedro Alves  <palves@redhat.com>
 
        * debug.h (TRACE, ITRACE, DTRACE, DITRACE, PTRACE): Call

diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index 5278f3bd0bec38e2a74797075bd4c7f6d4bf11ea..bac36a99754a65d262ceb87cd655800c7975578a 100644 (file)
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -635,8 +635,9 @@ mon.o: mon.c $(BASICS_H) $(CPU_H) $(MON_H)
 
 # GDB after 4.16 expects the default_callback structure to be setup.
 # As a kludge, build the common stuff here for now.
-gentmap: ../common/gentmap.c Makefile targ-vals.def
-       $(CC_FOR_BUILD) $(BUILD_CFLAGS) -I. -I../common -I$(srcdir)/../common -o gentmap $< $(BUILD_LIBS)
+gentmap: $(srcdir)/../common/gentmap.c Makefile targ-vals.def
+       $(CC_FOR_BUILD) $(BUILD_CFLAGS) -I. -I../common -I$(srcdir)/../common \
+               -o gentmap $(srcdir)/../common/gentmap.c $(BUILD_LIBS)
 
 targ-vals.def: $(srcdir)/../common/nltvals.def
        rm -f targ-vals.def tmp-def
@@ -653,8 +654,8 @@ targ-map.c: Makefile gentmap $(srcdir)/../../move-if-change
        ./gentmap -c > tmp-map.c
        $(SHELL) $(srcdir)/../../move-if-change tmp-map.c targ-map.c
 
-callback.o: ../common/callback.c $(TARG_VALS_H) $(CONFIG_H)
-       $(CC) -c $(STD_CFLAGS) -DHAVE_CONFIG_H $<
+callback.o: $(srcdir)/../common/callback.c $(TARG_VALS_H) $(CONFIG_H)
+       $(CC) -c $(STD_CFLAGS) -DHAVE_CONFIG_H $(srcdir)/../common/callback.c
 
 targ-map.o: targ-map.c $(ANSIDECL_H) $(GDB_CALLBACK_H) $(TARG_VALS_H)
 
@@ -667,7 +668,7 @@ tconfig.h:
 
 # Rebuild options whenever something changes so the date/time is up to date.
 options.o: options.c $(CPU_H) $(OPTIONS_H) $(DEFINES_H) $(BASICS_H) $(IDECODE_H) $(INLINE) $(LIB_SRC) $(BUILT_SRC) config.status Makefile
-       $(CC) -c $(STD_CFLAGS) '-DOPCODE_RULES="@sim_opcode@"' '-DIGEN_FLAGS="$(IGEN_FLAGS)"' '-DDGEN_FLAGS="$(DGEN_FLAGS)"' $<
+       $(CC) -c $(STD_CFLAGS) '-DOPCODE_RULES="@sim_opcode@"' '-DIGEN_FLAGS="$(IGEN_FLAGS)"' '-DDGEN_FLAGS="$(DGEN_FLAGS)"' $(srcdir)/options.c
 
 defines.h: tmp-defines; @true
 tmp-defines: config.h Makefile