libetherpix

@@ -1 +1,2 @@

-lib

+/lib

+/obj

@@ -21,9 +21,6 @@ VER_MIN   := 2

 VER_REV   := 0

 VERSION   := $(VER_MAJ).$(VER_MIN).$(VER_REV)

-SRCS    := $(wildcard src/*.c)

-EX_SRCS := $(wildcard examples/src/*.c)

-

 CFLAGS     := -Wall -Wextra -Werror -O3

 DEFINES    := -DETP_VER_MAJ=$(VER_MAJ) -DETP_VER_MIN=$(VER_MIN) \

               -DETP_VER_REV=$(VER_REV)

@@ -99,13 +96,16 @@ ifeq ($(OS),)

   $(error unsupported operating system $(OS_RAW))

 endif

-SRCS_BASE    := $(patsubst %.c,%,$(SRCS))

-DEPS         := $(addsuffix .d,$(SRCS_BASE))

-OBJS         := $(addsuffix .o,$(SRCS_BASE))

-EX_SRCS_BASE := $(patsubst %.c,%,$(EX_SRCS))

-EX_DEPS      := $(addsuffix .d,$(EX_SRCS_BASE))

-EX_OBJS      := $(addsuffix .o,$(EX_SRCS_BASE))

-EX_TARGETS   := $(addsuffix $(BSUF),$(EX_SRCS_BASE))

+SRCS      := $(wildcard src/*.c)

+SRCS_BASE := $(notdir $(patsubst %.c,%,$(SRCS)))

+DEPS      := $(addprefix obj/,$(addsuffix .d,$(SRCS_BASE)))

+OBJS      := $(addprefix obj/,$(addsuffix .o,$(SRCS_BASE)))

+

+EX_SRCS      := $(wildcard examples/src/*.c)

+EX_SRCS_BASE := $(notdir $(patsubst %.c,%,$(EX_SRCS)))

+EX_DEPS      := $(addprefix examples/obj/,$(addsuffix .d,$(EX_SRCS_BASE)))

+EX_OBJS      := $(addprefix examples/obj/,$(addsuffix .o,$(EX_SRCS_BASE)))

+EX_TARGETS   := $(addprefix examples/bin/,$(addsuffix $(BSUF),$(EX_SRCS_BASE)))

 TARGET    := lib/$(LIBTARGET).a

 SH_TARGET := lib/$(LIBTARGET).$(LEXT)$(LEXTSUF)

@@ -126,23 +126,23 @@ endif

 .SECONDARY:

 .SUFFIXES:

-all: $(DEPS) $(TARGET) $(SH_TARGET) $(EX_TARGETS)

+all: $(DEPS) $(TARGET) $(SH_TARGET) $(EX_DEPS) $(EX_TARGETS)

 ifneq ($(MAKECMDGOALS),clean)

   -include $(DEPS)

 endif

-%.d: %.c

-	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -MM -MF $@ -MT $(@:.d=.o) $<

+obj:

+	mkdir -p $@

-%.o: %.c

-	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c -o $@ $<

+lib:

+	mkdir -p $@

-%$(BSUF): %.o $(TARGET) $(SH_TARGET)

-	$(CC) $(EX_LDFLAGS) -o $@ $< $(EX_LIBS)

+obj/%.d: src/%.c | obj

+	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -MM -MF $@ -MT $(@:.d=.o) $<

-lib:

-	mkdir -p lib

+obj/%.o: src/%.c | obj

+	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c -o $@ $<

 $(TARGET): $(OBJS) | lib

 	$(AR) cr $@ $(filter-out lib,$+)

@@ -162,9 +162,23 @@ ifeq ($(OS),linux)

 	         $(patsubst %.$(VER_MAJ).$(VER_MIN).$(VER_REV),%,$(notdir $@))

 endif

+examples/obj:

+	mkdir -p $@

+

+examples/bin:

+	mkdir -p $@

+

+examples/obj/%.d: examples/src/%.c | examples/obj

+	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -MM -MF $@ -MT $(@:.d=.o) $<

+

+examples/obj/%.o: examples/src/%.c | examples/obj

+	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c -o $@ $<

+

+examples/bin/%$(BSUF): examples/obj/%.o $(TARGET) $(SH_TARGET) | examples/bin

+	$(CC) $(EX_LDFLAGS) -o $@ $< $(EX_LIBS)

+

 clean:

-	rm -rf $(DEPS) $(OBJS) lib \

-	       $(EX_DEPS) $(EX_OBJS) $(EX_TARGETS)

+	rm -rf obj lib examples/obj examples/bin

 install: all

 	$(INSTALL) -d $(PREFIX)/include/etherpix

@@ -0,0 +1,2 @@

+/bin

+/obj

@@ -1,8 +0,0 @@

-*.d

-*.o

-blink

-blink.exe

-event

-event.exe

-fade

-fade.exe

@@ -1,2 +0,0 @@

-*.d

-*.o