From ea762d1b52ff042756398e8b659d5d60216ca690 Mon Sep 17 00:00:00 2001 From: lucas8 Date: Mon, 9 Jun 2014 18:15:32 +0200 Subject: [PATCH] A special client is not necessary : removed directory. --- Makefile | 19 +++++++++++-------- client/Makefile | 20 -------------------- client/main.c | 8 -------- server/config.c => config.c | 0 server/config.h => config.h | 0 server/fifo.c => fifo.c | 0 server/fifo.h => fifo.h | 0 server/graphic.c => graphic.c | 0 server/graphic.h => graphic.h | 0 server/main.c => main.c | 0 server/notif.c => notif.c | 0 server/notif.h => notif.h | 0 server/queue.c => queue.c | 0 server/queue.h => queue.h | 0 server/screen.c => screen.c | 0 server/screen.h => screen.h | 0 server/Makefile | 21 --------------------- server/timer.c => timer.c | 0 server/timer.h => timer.h | 0 server/window.c => window.c | 0 server/window.h => window.h | 0 21 files changed, 11 insertions(+), 57 deletions(-) delete mode 100644 client/Makefile delete mode 100644 client/main.c rename server/config.c => config.c (100%) rename server/config.h => config.h (100%) rename server/fifo.c => fifo.c (100%) rename server/fifo.h => fifo.h (100%) rename server/graphic.c => graphic.c (100%) rename server/graphic.h => graphic.h (100%) rename server/main.c => main.c (100%) rename server/notif.c => notif.c (100%) rename server/notif.h => notif.h (100%) rename server/queue.c => queue.c (100%) rename server/queue.h => queue.h (100%) rename server/screen.c => screen.c (100%) rename server/screen.h => screen.h (100%) delete mode 100644 server/Makefile rename server/timer.c => timer.c (100%) rename server/timer.h => timer.h (100%) rename server/window.c => window.c (100%) rename server/window.h => window.h (100%) diff --git a/Makefile b/Makefile index 2b01d4e..c2e60c4 100644 --- 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 deleted file mode 100644 index 8a2e9e9..0000000 --- a/client/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -OBJS=main.o -include ../param.mk - -all : $(CLIENT) - -$(CLIENT) : $(OBJS) - $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) - -%.o : %.c - $(CC) $(CFLAGS) -c -o $@ $< - -clean : - @touch $(OBJS) $(SERVER) - rm $(OBJS) $(SERVER) - -rec : clean all - -.PHONY: all clean rec - - diff --git a/client/main.c b/client/main.c deleted file mode 100644 index d2ffcd0..0000000 --- a/client/main.c +++ /dev/null @@ -1,8 +0,0 @@ -#include -#include - -int main(int argc, char *argv[]) -{ - return 0; -} - diff --git a/server/config.c b/config.c similarity index 100% rename from server/config.c rename to config.c diff --git a/server/config.h b/config.h similarity index 100% rename from server/config.h rename to config.h diff --git a/server/fifo.c b/fifo.c similarity index 100% rename from server/fifo.c rename to fifo.c diff --git a/server/fifo.h b/fifo.h similarity index 100% rename from server/fifo.h rename to fifo.h diff --git a/server/graphic.c b/graphic.c similarity index 100% rename from server/graphic.c rename to graphic.c diff --git a/server/graphic.h b/graphic.h similarity index 100% rename from server/graphic.h rename to graphic.h diff --git a/server/main.c b/main.c similarity index 100% rename from server/main.c rename to main.c diff --git a/server/notif.c b/notif.c similarity index 100% rename from server/notif.c rename to notif.c diff --git a/server/notif.h b/notif.h similarity index 100% rename from server/notif.h rename to notif.h diff --git a/server/queue.c b/queue.c similarity index 100% rename from server/queue.c rename to queue.c diff --git a/server/queue.h b/queue.h similarity index 100% rename from server/queue.h rename to queue.h diff --git a/server/screen.c b/screen.c similarity index 100% rename from server/screen.c rename to screen.c diff --git a/server/screen.h b/screen.h similarity index 100% rename from server/screen.h rename to screen.h diff --git a/server/Makefile b/server/Makefile deleted file mode 100644 index c2e60c4..0000000 --- a/server/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -OBJS=main.o window.o screen.o config.o graphic.o \ - notif.o queue.o timer.o fifo.o -include ../param.mk - -all : $(SERVER) - -$(SERVER) : $(OBJS) - $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) - -%.o : %.c - $(CC) $(CFLAGS) -c -o $@ $< - -clean : - @touch $(OBJS) $(SERVER) - rm $(OBJS) $(SERVER) - -rec : clean all - -.PHONY: all clean rec - - diff --git a/server/timer.c b/timer.c similarity index 100% rename from server/timer.c rename to timer.c diff --git a/server/timer.h b/timer.h similarity index 100% rename from server/timer.h rename to timer.h diff --git a/server/window.c b/window.c similarity index 100% rename from server/window.c rename to window.c diff --git a/server/window.h b/window.h similarity index 100% rename from server/window.h rename to window.h