moved sources to src/ dir, clean with explicit defined files

Makefile

@@ -5,7 +5,10 @@ OBJS	= armc-start.o armc-cstartup.o armc-cstubs.o armc-cppstubs.o \
 	Drive.o gcr.o prot.o lz.o emmc.o diskio.o options.o Screen.o \
 	Timer.o FileBrowser.o DiskCaddy.o ROMs.o InputMappings.o xga_font_data.o
 
-LIBS    = uspi/lib/libuspi.a
+SRCDIR   = src
+OBJS    := $(addprefix $(SRCDIR)/, $(OBJS))
+
+LIBS     = uspi/libuspi.a
 INCLUDE  = -Iuspi/include/
 
 TARGET  ?= kernel
@@ -20,12 +23,11 @@ $(TARGET): $(OBJS) $(LIBS)
 	$(Q)$(PREFIX)objdump -d $(TARGET).elf | $(PREFIX)c++filt > $(TARGET).lst
 	$(Q)$(PREFIX)objcopy $(TARGET).elf -O binary $(TARGET).img
 
-uspi/lib/libuspi.a:
-	$(MAKE) -C uspi/lib
+uspi/libuspi.a:
+	$(MAKE) -C uspi
 
-clean: clean_libs
-
-clean_libs:
-	$(MAKE) -C uspi/lib clean
+clean:
+	$(Q)$(RM) $(OBJS) $(TARGET).elf $(TARGET).map $(TARGET).lst $(TARGET).img
+	$(MAKE) -C uspi clean
 
 include Makefile.rules

Makefile.rules

@@ -1,4 +1,4 @@
-# To show build commands: make
+# To show build commands: make V=1
 ifneq ($(V),1)
 Q		:= @
 endif
@@ -45,7 +45,4 @@ CFLAGS	 += -fno-delete-null-pointer-checks -fdata-sections -ffunction-sections -
 
 %.o: %.cpp
 	@echo "  CPP  $@"
-	$(Q)$(CPP) $(CPPFLAGS) $(INCLUDE) -c -o $@ $<
-
-clean:
-	$(RM) *.o *.a *.elf *.lst *.img *.map
+	$(Q)$(CPP) $(CPPFLAGS) $(INCLUDE) -c -o $@ $<

uspi/Makefile

@@ -27,12 +27,19 @@ OBJS	= uspilibrary.o \
 	  dwhcirootport.o usbmouse.o \
 	  dwhciframeschednsplit.o usbgamepad.o synchronize.o usbstring.o usbmidi.o
 
-INCLUDE = -I../include
+SRCDIR  = lib
+OBJS   := $(addprefix $(SRCDIR)/, $(OBJS))
 
-all: libuspi.a
+TARGET  = libuspi
+INCLUDE = -Iinclude
 
-libuspi.a: $(OBJS)
+all: $(TARGET).a
+
+$(TARGET).a: $(OBJS)
 	@echo "  LINK $@"
-	$(Q)$(AR) cr libuspi.a $(OBJS)
+	$(Q)$(AR) cr $(TARGET).a $(OBJS)
 
-include ../../Makefile.rules
+clean:
+	$(Q)$(RM) $(OBJS) $(TARGET).a
+
+include ../Makefile.rules