--- hatari/src/Makefile 2019/04/01 07:12:29 1.1.1.11 +++ hatari/src/Makefile 2019/04/01 07:12:56 1.1.1.12 @@ -23,12 +23,12 @@ GUIOBJS = ./gui-sdl/dlgAbout.o ./gui-sdl ./gui-sdl/dlgSystem.o ./gui-sdl/dlgFileSelect.o ./gui-sdl/sdlgui.o -SRCS = audio.c bios.c blitter.c cart.c cfgopts.c configuration.c \ - createBlankImage.c debugui.c dialog.c dim.c dmaSnd.c fdc.c file.c floppy.c \ - gemdos.c hdc.c ikbd.c int.c ioMem.c ioMemTables.c joy.c keymap.c log.c \ - m68000.c main.c midi.c memorySnapShot.c mfp.c misc.c msa.c psg.c \ - printer.c rs232.c reset.c rtc.c st.c stMemory.c screen.c screenSnapShot.c \ - shortcut.c sound.c spec512.c tos.c unzip.c vdi.c video.c \ +SRCS = audio.c bios.c blitter.c cart.c cfgopts.c configuration.c options.c \ + createBlankImage.c cycles.c debugui.c dialog.c dim.c dmaSnd.c fdc.c file.c \ + floppy.c gemdos.c hdc.c ikbd.c int.c ioMem.c ioMemTables.c joy.c keymap.c \ + log.c m68000.c main.c midi.c memorySnapShot.c mfp.c misc.c msa.c psg.c \ + printer.c rs232.c reset.c rtc.c scandir.c st.c stMemory.c screen.c \ + screenSnapShot.c shortcut.c sound.c spec512.c tos.c unzip.c vdi.c video.c \ wavFormat.c xbios.c ymFormat.c zip.c OBJS = $(SRCS:.c=.o) @@ -42,12 +42,6 @@ all: hatari hatari: $(ALLOBJS) $(CC) $(LDFLAGS) $(ALLOBJS) $(SDL_LIBS) $(LIBS) -o hatari -clean: - rm -f *.o hatari - $(MAKE) -C gui-sdl/ clean - $(MAKE) -C uae-cpu/ clean - - # Sub-folder dependencies: uae-cpu/%.o: uae-cpu/%.c $(MAKE) -C uae-cpu/ all @@ -62,12 +56,23 @@ gui-sdl/%.o: gui-sdl/%.c $(MAKE) -C gui-sdl/ all +clean: + $(RM) *.o hatari + $(MAKE) -C gui-sdl/ clean + $(MAKE) -C uae-cpu/ clean + +distclean: + $(RM) *.o hatari + $(RM) Makefile.dep *~ *.bak *.orig + $(MAKE) -C gui-sdl/ distclean + $(MAKE) -C uae-cpu/ distclean + + # Use "make depend" to generate file dependencies: -depend: $(SRCS) +Makefile.dep: Makefile $(CC) -MM $(CFLAGS) $(SRCS) > Makefile.dep - $(MAKE) -C gui-sdl/ depend -ifneq (,$(wildcard Makefile.dep)) -include Makefile.dep -endif +depend: Makefile.dep + $(MAKE) -C gui-sdl/ depend +-include Makefile.dep