diff options
author | 2012-02-23 14:19:37 +0000 | |
---|---|---|
committer | 2012-02-23 14:19:37 +0000 | |
commit | 97c3d0cb3986b29007ab69d6401d367d2f5b09bd (patch) | |
tree | b7ecebcaeaad8232c80cae48dc8389ac37a346df /makefile | |
parent | dc0fc0e01fd65f29fade25c082977da1cbeb1e9d (diff) |
- removed need for *_dev.lst files [Miodrag Milanovic]
- enforced short names for slot card devices
- updated validation, romverify and listxml output accordingly
- slotoptions now also contain shortnames so it's possible to link
slot option and device
Diffstat (limited to 'makefile')
-rw-r--r-- | makefile | 12 |
1 files changed, 1 insertions, 11 deletions
@@ -591,8 +591,6 @@ VERSIONOBJ = $(OBJ)/version.o EMUINFOOBJ = $(OBJ)/$(TARGET)/$(TARGET).o DRIVLISTSRC = $(OBJ)/$(TARGET)/$(SUBTARGET)/drivlist.c DRIVLISTOBJ = $(OBJ)/$(TARGET)/$(SUBTARGET)/drivlist.o -DEVLISTSRC = $(OBJ)/$(TARGET)/$(SUBTARGET)/devlist.c -DEVLISTOBJ = $(OBJ)/$(TARGET)/$(SUBTARGET)/devlist.o @@ -733,7 +731,7 @@ $(sort $(OBJDIRS)): ifndef EXECUTABLE_DEFINED -$(EMULATOR): $(VERSIONOBJ) $(EMUINFOOBJ) $(DRIVLISTOBJ) $(DEVLISTOBJ) $(DRVLIBS) $(LIBOSD) $(LIBCPU) $(LIBEMU) $(LIBDASM) $(LIBSOUND) $(LIBUTIL) $(EXPAT) $(SOFTFLOAT) $(JPEG_LIB) $(FLAC_LIB) $(7Z_LIB) $(FORMATS_LIB) $(ZLIB) $(LIBOCORE) $(RESFILE) +$(EMULATOR): $(VERSIONOBJ) $(EMUINFOOBJ) $(DRIVLISTOBJ) $(DRVLIBS) $(LIBOSD) $(LIBCPU) $(LIBEMU) $(LIBDASM) $(LIBSOUND) $(LIBUTIL) $(EXPAT) $(SOFTFLOAT) $(JPEG_LIB) $(FLAC_LIB) $(7Z_LIB) $(FORMATS_LIB) $(ZLIB) $(LIBOCORE) $(RESFILE) $(CC) $(CDEFS) $(CFLAGS) -c $(SRC)/version.c -o $(VERSIONOBJ) @echo Linking $@... $(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $^ $(LIBS) -o $@ @@ -776,18 +774,10 @@ $(DRIVLISTOBJ): $(DRIVLISTSRC) @echo Compiling $<... $(CC) $(CDEFS) $(CFLAGS) -c $< -o $@ -$(DEVLISTOBJ): $(DEVLISTSRC) - @echo Compiling $<... - $(CC) $(CDEFS) $(CFLAGS) -c $< -o $@ - $(DRIVLISTSRC): $(SRC)/$(TARGET)/$(SUBTARGET).lst $(MAKELIST_TARGET) @echo Building driver list $<... @$(MAKELIST) $< >$@ -$(DEVLISTSRC): $(SRC)/$(TARGET)/$(SUBTARGET)_dev.lst $(MAKEDEV_TARGET) - @echo Building device list $<... - @$(MAKEDEV) $< >$@ - $(OBJ)/%.a: @echo Archiving $@... $(RM) $@ |