Merge pull request #615 from ps2dev/revert-609-spu2_stuff

Revert "SPU2 related additions"

Rules.make

@@ -27,7 +27,7 @@ $(subdir_release): dummy
 # Directory-level parallelism has been disabled due to issues with
 # multiple Make instances running inside a directory at once
 # and causing output file corruption
-.NOTPARALLEL:: $(subdir_list) $(subdir_clean) $(subdir_release)
+.NOTPARALLEL: $(subdir_list) $(subdir_clean) $(subdir_release)
 endif
 
 all: $(subdir_list)

ee/Rules.bin.make

@@ -26,9 +26,4 @@ $(PS2SDKSRC)/ee/rpc/cdvd/lib/libcdvd.a:
 
 $(PS2SDKSRC)/ee/libcglue/lib/libcglue.a:
 	$(MAKEREC) $(PS2SDKSRC)/ee/libcglue
-
-.NOTPARALLEL:: \
-	$(PS2SDKSRC)/ee/kernel/lib/libkernel.a \
-	$(PS2SDKSRC)/ee/rpc/cdvd/lib/libcdvd.a \
-	$(PS2SDKSRC)/ee/libcglue/lib/libcglue.a
 endif

ee/elf-loader/Makefile

@@ -28,7 +28,3 @@ $(EE_OBJS_DIR)loader.o: $(EE_OBJS_DIR)loader.c
 
 clean::
 	$(MAKEREC) src/loader clean
-
-.NOTPARALLEL:: \
-	$(PS2SDKSRC)/tools/bin2c/bin/bin2c \
-	src/loader/bin/loader.elf

ee/iopreboot/Makefile

@@ -36,7 +36,3 @@ $(EE_OBJS_DIR)imgdrv_irx.c: $(EE_SRC_DIR)imgdrv/irx/imgdrv.irx $(PS2SDKSRC)/tool
 
 clean::
 	$(MAKEREC) $(EE_SRC_DIR)imgdrv clean
-
-.NOTPARALLEL:: \
-	$(PS2SDKSRC)/tools/bin2c/bin/bin2c \
-	$(EE_SRC_DIR)imgdrv/irx/imgdrv.irx

ee/kernel/Makefile

@@ -364,10 +364,3 @@ clean::
 	$(MAKEREC) $(EE_SRC_DIR)tlbsrc clean
 	$(MAKEREC) $(EE_SRC_DIR)srcfile clean
 	$(MAKEREC) $(EE_SRC_DIR)eenull clean
-
-.NOTPARALLEL:: \
-	$(PS2SDKSRC)/tools/bin2c/bin/bin2c \
-	$(EE_SRC_DIR)osdsrc/bin/osdsrc.bin \
-	$(EE_SRC_DIR)tlbsrc/bin/tlbsrc.bin \
-	$(EE_SRC_DIR)srcfile/bin/srcfile.bin \
-	$(EE_SRC_DIR)eenull/bin/eenull.bin

ee/network/tcpip/Makefile

@@ -164,6 +164,3 @@ endif
 $(EE_OBJS_DIR)udp.o: $(LWIP)/src/core/udp.c
 	$(EE_CC) $(EE_CFLAGS) $(EE_INCS) -c $< -o $@
 
-.NOTPARALLEL:: \
-	$(LWIP)
-

iop/fs/bdm/Makefile

@@ -19,6 +19,3 @@ include $(PS2SDKSRC)/iop/Rules.release
 
 $(PS2SDKSRC)/iop/fs/libbdm/lib/libbdm.a:
 	$(MAKEREC) $(PS2SDKSRC)/iop/fs/libbdm
-
-.NOTPARALLEL:: \
-	$(PS2SDKSRC)/iop/fs/libbdm/lib/libbdm.a

iop/sound/Makefile

@@ -6,15 +6,7 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
-SUBDIRS = \
-	ahx \
-	audsrv \
-	clearspu \
-	libsd \
-	libsnd2 \
-	libspu2 \
-	ps2snd \
-	rspu2drv
+SUBDIRS = libsd ahx audsrv ps2snd
 
 include $(PS2SDKSRC)/Defs.make
 include $(PS2SDKSRC)/Rules.make