buildsystem: merge libpad and libpadx

Author: uyjulian

ee/rpc/Makefile

@@ -17,7 +17,6 @@ SUBDIRS += memorycard
 SUBDIRS += mouse
 SUBDIRS += multitap
 SUBDIRS += pad
-SUBDIRS += padx
 SUBDIRS += poweroff
 SUBDIRS += ps2snd
 SUBDIRS += remote

ee/rpc/pad/Makefile

@@ -6,6 +6,8 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
+EE_LIB_ALTNAMES ?= libpadx.a
+
 EE_OBJS = libpad.o erl-support.o
 
 include $(PS2SDKSRC)/Defs.make

ee/rpc/pad/samples/Makefile

@@ -2,11 +2,11 @@
 #  ____|   |    ____|   |        | |____|
 # |     ___|   |____ ___|    ____| |    \    PS2DEV Open Source Project.
 #-----------------------------------------------------------------------
-# Copyright 2001-2004, ps2dev - http://www.ps2dev.org
+# Copyright ps2dev - http://www.ps2dev.org
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
-SAMPLE_DIR = rpc/pad
+SUBDIRS = pad padx
 
 include $(PS2SDKSRC)/Defs.make
-include $(PS2SDKSRC)/samples/Rules.samples
+include $(PS2SDKSRC)/Rules.make

ee/rpc/padx/Makefile ee/rpc/pad/samples/pad/Makefileee/rpc/padx/Makefile renamed to ee/rpc/pad/samples/pad/Makefile

@@ -6,9 +6,7 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
-EE_SRC_DIR = $(PS2SDKSRC)/ee/rpc/pad/src/
-EE_INC_DIR = $(PS2SDKSRC)/ee/rpc/pad/include/
+SAMPLE_DIR = rpc/pad
 
-EE_CFLAGS += -D_XPAD
-
-include $(PS2SDKSRC)/ee/rpc/pad/Makefile
+include $(PS2SDKSRC)/Defs.make
+include $(PS2SDKSRC)/samples/Rules.samples