Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 0 additions & 60 deletions .gitattributes

This file was deleted.

23 changes: 19 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
/Makefile
/bin/amiga-m68k
/bin/linux-x86_64
/bin/linux-aarch64
/distfiles
/config.status
/contrib
Expand All @@ -21,6 +22,11 @@

# Apollo
/ApolloROM.*
aros.rom
ApolloOS.code-workspace
arch/m68k-amiga/boot/romlog.txt
compiler/include/geninc.cfg
ApolloOS.code-workspace

# /boot/
/boot/mmakefile
Expand Down Expand Up @@ -2135,8 +2141,17 @@
/workbench/utilities/Presenter/mmakefile
config/features.status
config/config.log
compiler/include/geninc.cfg
bin/Sources/.freetype-2.10.0-fetched
aros.rom
ApolloOS.code-workspace
rom/hidds/pci/pcitool/strings.h
workbench/c/R/strings.h
workbench/devs/diskimage/device/strings.h
workbench/devs/diskimage/zune_gui/strings.h
workbench/libs/muimaster/muimaster_strings.h
workbench/prefs/appearance/strings.h
workbench/prefs/boingiconbar/strings.h
workbench/prefs/printer/strings.h
workbench/system/find/strings.h
workbench/tools/BoingIconBar/strings.h
workbench/tools/InstallAROS/strings.h
workbench/tools/SysExplorer/strings.h
workbench/tools/WiMP/strings.h
arch/m68k-amiga/boot/romlog.txt
10 changes: 6 additions & 4 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,9 @@ makedirs:
$(MKDIR) "$$dir" ; \
else true ; fi ; \
done
@$(IF) [ ! -f $(AROSDIR)/.gdbinit ]; then \
$(CP) $(SRCDIR)/_gdbinit $(AROSDIR)/.gdbinit ; \
else true ; fi
# @$(IF) [ ! -f $(AROSDIR)/.gdbinit ]; then \
# $(CP) $(SRCDIR)/_gdbinit $(AROSDIR)/.gdbinit ; \
# else true ; fi

$(PARSEOFFSETS): $(wildcard $(SRCDIR)/tools/parseoffsets/*.[ch])
@$(ECHO) Building parseoffsets...
Expand Down Expand Up @@ -285,7 +285,9 @@ clean:
$(TOOLDIR)/$(AROS_TARGET_CPU)-$(AROS_TARGET_ARCH)$(AROS_TARGET_SUFFIX)-aros-ld \
$(GENDIR)/scripts/genshared $(TOOLDIR)/genmf.py \
tools/adflib/myconf.aros tools/collect-aros/env.h \
config/features.status
config/features.status \
ApolloROM.* $(DISTDIR) \
$(TOP)/bin/$(AROS_TARGET_ARCH)-$(AROS_TARGET_CPU) $(TOP)/bin/$(AROS_HOST_ARCH)-$(AROS_HOST_CPU)

# Clean the sources and tools
arch-clean: clean
Expand Down
Loading