From: Daniel Carl Date: Sat, 24 Jan 2015 21:59:57 +0000 (+0100) Subject: Removed debug target. X-Git-Url: https://git.owens.tech/assets/static/git-favicon.png/assets/static/git-favicon.png/git?a=commitdiff_plain;h=c97ce14eb4637e66e9ecad45e96c06c362ac7415;p=vimb.git Removed debug target. It easy to set the CFLAGS and do a make clean, make. So there is no need to bloat the Makefile for this. --- diff --git a/Makefile b/Makefile index a774760..9e79c81 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,6 @@ include config.mk all: $(TARGET) -debug: $(DTARGET) test: $(LIBTARGET) @$(MAKE) $(MFLAGS) -s -C tests @@ -26,8 +25,8 @@ uninstall: $(RM) $(DESTDIR)$(MANDIR1)/$(MAN1) clean: test-clean - $(RM) src/*.o src/*.do src/*.lo src/hints.js.h - $(RM) $(TARGET) $(DTARGET) + $(RM) src/*.o src/*.lo src/hints.js.h + $(RM) $(TARGET) test-clean: $(RM) $(LIBTARGET) @@ -41,7 +40,6 @@ dist-clean: $(RM) $(DIST_FILE) src/hints.o: src/hints.js.h -src/hints.do: src/hints.js.h src/hints.lo: src/hints.js.h src/hints.js.h: src/hints.js @@ -49,17 +47,12 @@ src/hints.js.h: src/hints.js @cat $< | src/js2h.sh > $@ $(OBJ): src/config.h config.mk -$(DOBJ): src/config.h config.mk $(LOBJ): src/config.h config.mk $(TARGET): $(OBJ) @echo "$(CC) $@" @$(CC) $(OBJ) -o $@ $(LDFLAGS) -$(DTARGET): $(DOBJ) - @echo "$(CC) $@" - @$(CC) $(DOBJ) -o $@ $(DLDFLAGS) - $(LIBTARGET): $(LOBJ) @echo "$(CC) $@" @$(CC) -shared ${LOBJ} -o $@ $(LDFLAGS) @@ -72,13 +65,9 @@ src/config.h: @echo "${CC} $@" @$(CC) $(CFLAGS) -c -o $@ $< -%.do: %.c %.h - @echo "${CC} $@" - @$(CC) $(DFLAGS) -c -o $@ $< - %.lo: %.c %.h @echo "${CC} $@" - @$(CC) -DTESTLIB $(DFLAGS) -fPIC -c -o $@ $< + @$(CC) -DTESTLIB $(CFLAGS) -fPIC -c -o $@ $< -include $(DEPS) diff --git a/config.mk b/config.mk index 67577a0..3197d95 100644 --- a/config.mk +++ b/config.mk @@ -50,17 +50,11 @@ CFLAGS += -Wno-overlength-strings -Werror=format-security CFLAGS += ${CPPFLAGS} LDFLAGS += ${LIBFLAGS} -# compiler flags for the debug target -DFLAGS += $(CFLAGS) -ggdb -g -O0 -DLDFLAGS += ${LIBFLAGS} - OBJ = $(patsubst %.c, %.o, $(wildcard src/*.c)) -DOBJ = $(patsubst %.c, %.do, $(wildcard src/*.c)) LOBJ = $(patsubst %.c, %.lo, $(wildcard src/*.c)) DEPS = $(OBJ:%.o=%.d) TARGET = $(PROJECT) -DTARGET = $(TARGET)_dbg LIBTARGET = tests/lib$(PROJECT).so DIST_FILE = $(PROJECT)_$(VERSION).tar.gz MANDIR1 = $(MANDIR)/man1