1 files changed, 49 insertions, 11 deletions
diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index e2c13e0..9adf027 100644
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -30,12 +30,12 @@ exec_prefix = @exec_prefix@
 host_alias = @host_alias@
 target_alias = @target_alias@
 program_transform_name = @program_transform_name@
-bindir = $(exec_prefix)/bin
-libdir = $(exec_prefix)/lib
+bindir = @bindir@
+libdir = @libdir@
 tooldir = $(libdir)/$(target_alias)
 
-datadir = $(prefix)/lib
-mandir = $(prefix)/man
+datadir = @datadir@
+mandir = @mandir@
 man1dir = $(mandir)/man1
 man2dir = $(mandir)/man2
 man3dir = $(mandir)/man3
@@ -45,15 +45,14 @@ man6dir = $(mandir)/man6
 man7dir = $(mandir)/man7
 man8dir = $(mandir)/man8
 man9dir = $(mandir)/man9
-infodir = $(prefix)/info
-includedir = $(prefix)/include
-docdir = $(datadir)/doc
+infodir = @infodir@
+includedir = @includedir@
 
 SHELL = /bin/sh
 
 INSTALL = $(srcroot)/install.sh -c
-INSTALL_PROGRAM = $(INSTALL)
-INSTALL_DATA = $(INSTALL)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)'
 INSTALL_XFORM1= $(INSTALL_XFORM) -b=.1
 
@@ -206,6 +205,7 @@ BUILT_SRC_WO_CONFIG = \
 	itable.h itable.c \
 	spreg.h spreg.c \
 	model.h model.c \
+	pk.h \
 	hw.h hw.c \
 	filter_host.c
 
@@ -239,6 +239,7 @@ LIB_SRC = \
 	cap.c \
 	mon.c \
 	options.c \
+	$(PACKAGE_SRC) \
 	$(HW_SRC)
 
 MAIN_SRC = \
@@ -276,6 +277,7 @@ LIB_OBJ = \
 	idecode.o \
 	psim.o \
 	options.o \
+	$(PACKAGES) \
 	$(HW)
 
 
@@ -286,6 +288,12 @@ HW_SRC = \
 	hw_memory.c \
 	hw_nvram.c \
 	hw_iobus.c \
+	hw_htab.c \
+	hw_disk.c \
+	hw_trace.c \
+	hw_register.c \
+	hw_vm.c \
+	hw_init.c \
 	hw_pal.c
 
 HW = \
@@ -293,8 +301,20 @@ HW = \
 	hw_memory.o \
 	hw_nvram.o \
 	hw_iobus.o \
+	hw_htab.o \
+	hw_disk.o \
+	hw_trace.o \
+	hw_register.o \
+	hw_vm.o \
+	hw_init.o \
 	hw_pal.o
 
+PACKAGE_SRC = \
+	pk_disklabel.c
+
+PACKAGES = \
+	pk_disklabel.o
+
 
 psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBS)
 	$(CC) $(CFLAGS) $(SIM_CFLAGS) $(LDFLAGS) -o psim main.o $(TARGETLIB) $(BFD_LIB) $(LIBIBERTY_LIB) $(LIBS)
@@ -450,14 +470,14 @@ misc.o: misc.c misc.h filter_filename.h
 # With out this #, make thinks that misc.o doesn't have a rule
 
 # real hardware
-hw.h:
+hw.h: Makefile
 	(cd $(srcdir); ls $(HW_SRC)) \
 	| sed -e 's/^.*\(hw_.*\)\.c/\1/' \
 		-e 's/^/extern const device_descriptor /' \
 		-e 's/$$/_device_descriptor\[\];/' \
 		> tmp-hw.h
 	mv tmp-hw.h hw.h
-hw.c:
+hw.c: Makefile
 	(cd $(srcdir); ls $(HW_SRC)) \
 	| sed -e 's/^.*\(hw_.*\)\.c/\1/' \
 		-e 's/^/    /' \
@@ -469,9 +489,27 @@ hw_memory.o: hw_memory.c $(DEVICE_TABLE_H)
 hw_nvram.o: hw_nvram.c $(DEVICE_TABLE_H)
 hw_iobus.o: hw_iobus.c $(DEVICE_TABLE_H)
 hw_pal.o: hw_pal.c $(DEVICE_TABLE_H)
+hw_htab.o: hw_htab.c $(DEVICE_TABLE_H)
+hw_disk.o: hw_disk.c $(DEVICE_TABLE_H) pk.h
+hw_trace.o: hw_trace.c $(DEVICE_TABLE_H)
+hw_register.o: hw_register.c $(DEVICE_TABLE_H)
+hw_vm.o: hw_vm.c $(DEVICE_TABLE_H)
+hw_init.o: hw_init.c $(DEVICE_TABLE_H)
 # ignore this line, it stops make from getting confused
 
 
+# real packages
+pk.h: Makefile
+	(cd $(srcdir); ls $(PACKAGE_SRC)) \
+	| sed -e 's/^pk_\(.*\)\.c/\1/' \
+		-e 's/^/extern package_create_instance_callback pk_/' \
+		-e 's/$$/_create_instance;/' \
+		> tmp-pk.h
+	mv tmp-pk.h pk.h
+
+pk_disklabel.o: pk.h $(DEVICE_TABLE_H)
+# ignore this line, it stops make from getting confused
+
 tags etags: TAGS
 
 TAGS: $(BUILT_SRC)