one instance ?

--HG--
branch : entry_per_view

1 files changed, 9 insertions, 31 deletions

diff --git a/src/Makefile b/src/Makefile
index 1bfd7433..581ef671 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,16 +1,4 @@
-CC    = gcc
-LIBS  += gtk+-2.0
-LIBS  += webkit-1.0
-FLAGS += -Wall 
-FLAGS += -pipe
-FLAGS += `pkg-config --cflags --libs $(LIBS)` 
-
-FLAGS +=--ansi
-FLAGS +=-std=c99
-#OBJ = $(patsubst %.c, %.o, $(wildcard *.c))
-SOURCE =  $(wildcard *.c)
-HDR = config.h 
-TARGET = dwb
+include config.mk
 
 %.o: %.c $(HDR)
 	@echo "${CC} $<"
@@ -18,28 +6,18 @@ TARGET = dwb
 
 all: $(TARGET) 
 
-#hints.h: $(JAVASCRIPT)
-#	@echo creating hints.h
-#	@cat ../hintoptions.js > hints.h
-#	@cat hints.js >> hints.h
-#	@sed -i 's/\\/\\\\/g' hints.h
-#	@sed -i 's/\"/\\\"/g' hints.h
-#	@sed -i 's/\s\s*/ /g'  hints.h
-#	@sed -i 's/^\s*\/\/.*//' hints.h 
-#	@sed -i '1s/^/#define HINTS \"/' hints.h 
-#	@sed -i ':a;N;s/\n//;ta' hints.h
-#	@sed -i 's/$$/\"/' hints.h
+$(TARGET): $(OBJ)
+	@$(CC) $(FLAGS) $(OBJ) -o $(TARGET) 
 
-$(TARGET): $(SOURCE) $(HDR)
-	@$(CC) $(FLAGS) $(SOURCE) $(DEBUG) -o $(TARGET) 
 
 debug: 
-	@$(MAKE) -B DEBUG="-g" TARGET="dwb-debug"
+	@$(MAKE) -B DEBUG=$(DFLAGS) TARGET=$(DTARGET)
 
 clean:
-	@echo cleaning
-	@rm -f $(OBJ)
-	@rm -f $(TARGET)
-	@rm -f config.h hints.h startpage.h
+	@echo cleaning...
+	@echo "removing $(OBJ) $(TARGET)"
+	@$(RM) $(OBJ)
+	@$(RM) $(TARGET)
+	@$(RM) config.h hints.h startpage.h
 
 .PHONY: clean all