Make hw-main.h the main header file for H/W devices. Like sim-main.h

[deliverable/binutils-gdb.git] / sim / common / Make-common.in

diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index dcc8c7a7383d3a7514f064bc070638329be67e90..b92486ccc33ea794070e85a67b725d86c6e74183 100644 (file)
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -325,7 +325,8 @@ hw-ports_h = $(srccom)/hw-ports.h
 hw-properties_h = $(srccom)/hw-properties.h
 hw-tree_h = $(srccom)/hw-tree.h
 
-hw_base_headers = \
+hw_main_headers = \
+       $(srccom)/hw-main.h \
        $(hw-alloc_h) \
        $(hw-base_h) \
        $(hw-device_h) \
@@ -465,9 +466,9 @@ hw-config.h: Makefile.in $(srccom)/Make-common.in config.status Makefile
        rm -f tmp-hw.h
        echo "/* generated by Makefile */" > tmp-hw.h
        for hw in $(SIM_HW) ; do \
-         echo "extern const struct hw_device_descriptor dv_$${hw}_descriptor[];" ; \
+         echo "extern const struct hw_descriptor dv_$${hw}_descriptor[];" ; \
        done >> tmp-hw.h
-       echo "const struct hw_device_descriptor *hw_descriptors[] = {" >> tmp-hw.h
+       echo "const struct hw_descriptor *hw_descriptors[] = {" >> tmp-hw.h
        for hw in $(SIM_HW) ; do \
          echo "  dv_$${hw}_descriptor," ; \
        done >> tmp-hw.h
@@ -475,53 +476,41 @@ hw-config.h: Makefile.in $(srccom)/Make-common.in config.status Makefile
        echo "};" >> tmp-hw.h
        mv tmp-hw.h hw-config.h
 
-hw-alloc.o: $(srccom)/hw-alloc.c $(sim_main_headers) \
-         $(hw-alloc_h)
+hw-alloc.o: $(srccom)/hw-alloc.c $(hw_main_headers)
        $(CC) -c $(srccom)/hw-alloc.c $(ALL_CFLAGS)
 
-hw-base.o: $(srccom)/hw-base.c $(sim_main_headers) \
-         $(hw_base_headers) hw-config.h
+hw-base.o: $(srccom)/hw-base.c $(hw_main_headers) hw-config.h
        $(CC) -c $(srccom)/hw-base.c $(ALL_CFLAGS)
 
-hw-device.o: $(srccom)/hw-device.c $(sim_main_headers) \
-         $(hw-device_h)
+hw-device.o: $(srccom)/hw-device.c $(hw_main_headers)
        $(CC) -c $(srccom)/hw-device.c $(ALL_CFLAGS)
 
-hw-events.o: $(srccom)/hw-events.c $(sim_main_headers) \
-         $(hw-events_h)
+hw-events.o: $(srccom)/hw-events.c $(hw_main_headers) $(sim_main_headers)
        $(CC) -c $(srccom)/hw-events.c $(ALL_CFLAGS)
 
-hw-instances.o: $(srccom)/hw-instances.c $(sim_main_headers) \
-         $(hw_base_headers)
+hw-instances.o: $(srccom)/hw-instances.c $(hw_main_headers)
        $(CC) -c $(srccom)/hw-instances.c $(ALL_CFLAGS)
 
-hw-handles.o: $(srccom)/hw-handles.c $(sim_main_headers) \
-         $(hw_base_headers)
+hw-handles.o: $(srccom)/hw-handles.c $(hw_main_headers)
        $(CC) -c $(srccom)/hw-handles.c $(ALL_CFLAGS)
 
-hw-ports.o: $(srccom)/hw-ports.c $(sim_main_headers) \
-         $(hw-ports_h)
+hw-ports.o: $(srccom)/hw-ports.c $(hw_main_headers)
        $(CC) -c $(srccom)/hw-ports.c $(ALL_CFLAGS)
 
-hw-properties.o: $(srccom)/hw-properties.c $(sim_main_headers) \
-         $(hw-properties_h)
+hw-properties.o: $(srccom)/hw-properties.c $(hw_main_headers)
        $(CC) -c $(srccom)/hw-properties.c $(ALL_CFLAGS)
 
-hw-tree.o: $(srccom)/hw-tree.c $(sim_main_headers) \
-         $(hw-tree_h) $(hw_base_headers)
+hw-tree.o: $(srccom)/hw-tree.c $(hw_main_headers) $(hw-tree_h)
        $(CC) -c $(srccom)/hw-tree.c $(ALL_CFLAGS)
 
 
-dv-core.o: $(srccom)/dv-core.c $(sim_main_headers) \
-         $(sim-main_h) $(hw_base_headers)
+dv-core.o: $(srccom)/dv-core.c $(hw_main_headers) $(sim_main_headers)
        $(CC) -c $(srccom)/dv-core.c $(ALL_CFLAGS)
 
-dv-glue.o: $(srccom)/dv-glue.c $(sim_main_headers) \
-         $(sim-main_h) $(hw_base_headers)
+dv-glue.o: $(srccom)/dv-glue.c $(hw_main_headers) $(sim_main_headers)
        $(CC) -c $(srccom)/dv-glue.c $(ALL_CFLAGS)
 
-dv-pal.o: $(srccom)/dv-pal.c $(sim_main_headers) \
-         $(sim-main_h) $(hw_base_headers)
+dv-pal.o: $(srccom)/dv-pal.c $(hw_main_headers) $(sim_main_headers)
        $(CC) -c $(srccom)/dv-pal.c $(ALL_CFLAGS)