A special client is not necessary : removed directory.

dwarfmaster · Jun 9, 2014 · ea762d1 · ea762d1
1 parent 919cd8d
commit ea762d1
Show file tree

Hide file tree

Showing 21 changed files with 11 additions and 57 deletions.
diff --git a/Makefile b/Makefile
@@ -1,18 +1,21 @@
+OBJS=main.o window.o screen.o config.o graphic.o \
+	 notif.o queue.o timer.o fifo.o
+include ../param.mk
 
-all : server client
+all : $(SERVER)
 
-client :
-	make -C client
+$(SERVER) : $(OBJS)
+	$(CC) $(CFLAGS)    -o $@ $^ $(LDFLAGS)
 
-server :
-	make -C server
+%.o : %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 clean :
-	make clean -C client
-	make clean -C server
+	@touch $(OBJS) $(SERVER)
+	rm $(OBJS) $(SERVER)
 
 rec : clean all
 
-.PHONY: all client server clean rec
+.PHONY: all clean rec
 
 
diff --git a/client/Makefile b/client/Makefile
diff --git a/client/main.c b/client/main.c
diff --git a/server/config.c → config.c b/server/config.c → config.c
diff --git a/server/config.h → config.h b/server/config.h → config.h
diff --git a/server/fifo.c → fifo.c b/server/fifo.c → fifo.c
diff --git a/server/fifo.h → fifo.h b/server/fifo.h → fifo.h
diff --git a/server/graphic.c → graphic.c b/server/graphic.c → graphic.c
diff --git a/server/graphic.h → graphic.h b/server/graphic.h → graphic.h
diff --git a/server/main.c → main.c b/server/main.c → main.c
diff --git a/server/notif.c → notif.c b/server/notif.c → notif.c
diff --git a/server/notif.h → notif.h b/server/notif.h → notif.h
diff --git a/server/queue.c → queue.c b/server/queue.c → queue.c
diff --git a/server/queue.h → queue.h b/server/queue.h → queue.h
diff --git a/server/screen.c → screen.c b/server/screen.c → screen.c
diff --git a/server/screen.h → screen.h b/server/screen.h → screen.h
diff --git a/server/Makefile b/server/Makefile
diff --git a/server/timer.c → timer.c b/server/timer.c → timer.c
diff --git a/server/timer.h → timer.h b/server/timer.h → timer.h
diff --git a/server/window.c → window.c b/server/window.c → window.c
diff --git a/server/window.h → window.h b/server/window.h → window.h