diff --git a/.gitignore b/.gitignore index c45184958f04f20653625afcd69c4c3e4ab83d1e..aba9a99c5c97768e684588efa1d0d8214f2809a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,16 @@ -*/nbproject/ -*.bz2 -*.gz +# Exclude doxygen +miosix/_doc/doxygen/html/* + +# Exclude temporary files +main.elf +main.bin +main.hex +main.map *.o *.a -*.elf -*.map -*.hex -*.bin -*~ *.d -*.directory \ No newline at end of file + +# Exclude Mac OS X temporary +._* +.DS_Store + diff --git a/Makefile b/Makefile index 936a9817156441ab9880ca144c97700969ece521..0a5249764136eed7e47ce4306a13ce325c4c600c 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,6 @@ SUBDIRS := miosix SRC := \ main.cpp - ## ## List here additional static libraries with relative path ## @@ -72,19 +71,16 @@ main: main.elf $(SZ) main.elf main.elf: $(OBJ) miosix/libmiosix.a - @ echo "========Linking========" + @ echo "linking" $(CXX) $(LFLAGS) -o main.elf $(OBJ) miosix/$(BOOT_FILE) $(LINK_LIBS) %.o: %.s - @echo "========Compiling $<========" $(AS) $(AFLAGS) $< -o $@ %.o : %.c - @echo "========Compiling $<========" $(CC) $(DFLAGS) $(CFLAGS) $< -o $@ %.o : %.cpp - @echo "========Compiling $<========" $(CXX) $(DFLAGS) $(CXXFLAGS) $< -o $@ #pull in dependecy info for existing .o files diff --git a/miosix/Makefile b/miosix/Makefile index f2d3f2801398a834e6c6eb9ccd7ea10c6c2cf857..c97d0f4b613676652ee28545262bc196efc3ed3c 100644 --- a/miosix/Makefile +++ b/miosix/Makefile @@ -26,7 +26,7 @@ kernel/scheduler/edf/edf_scheduler.cpp \ kernel/filesystem/filesystem.cpp \ kernel/filesystem/ff.c \ kernel/filesystem/diskio.cpp \ -kernel/SystemMap.cpp \ +kernel/SystemMap.cpp \ util/util.cpp \ util/version.cpp \ util/crc16.cpp \ @@ -53,18 +53,15 @@ all: $(OBJ) $(BOOT_FILE) $(AR) rcs libmiosix.a $(OBJ) clean: - -rm $(OBJ) $(BOOT_FILE) libmiosix.a $(OBJ:.o=.d) + -rm $(OBJ) $(BOOT_FILE) libmiosix.a $(OBJ:.o=.d) $(BOOT_FILE:.o=.d) %.o: %.s - @echo "========Compiling $<========" $(AS) $(AFLAGS) $< -o $@ %.o : %.c - @echo "========Compiling $<========" $(CC) $(DFLAGS) $(CFLAGS) $< -o $@ %.o : %.cpp - @echo "========Compiling $<========" $(CXX) $(DFLAGS) $(CXXFLAGS) $< -o $@ #pull in dependecy info for existing .o files