Se muda el namespace Plaqui a PlaQui::Server. Se completa un poco la clase Runnable.

[z.facultad/75.42/plaqui.git] / Server / src / Makefile

diff --git a/Server/src/Makefile b/Server/src/Makefile
index 569d18de66f349d56117f08102cb641375edc116..f1a4b8364b46b58f9ce5ea6f1ae9ff0a6014a4bd 100644 (file)
--- a/Server/src/Makefile
+++ b/Server/src/Makefile
@@ -26,10 +26,11 @@
 #
 
 # Directorio con los .h
-INCLUDE_DIR=../include
+INCLUDE_BASE_DIR=../include
+INCLUDE_DIR=$(INCLUDE_BASE_DIR)/plaqui/server
 
 # Opciones para el compilador.
-CXXFLAGS=-ansi -pedantic -Wall -I$(INCLUDE_DIR) \
+CXXFLAGS=-ansi -pedantic -Wall -I$(INCLUDE_BASE_DIR) \
                `pkg-config --cflags glibmm-2.0` `pkg-config --cflags gthread-2.0`
 CXXFLAGS+=-g -DDEBUG
 #CXXFLAGS+=-g
@@ -42,6 +43,14 @@ TARGETS=server.a
 # Regla por defecto.
 all: $(TARGETS)
 
+string_h=$(INCLUDE_DIR)/string.h
+objects+=string.o
+string.o: $(string_h) string.cpp
+
+request_h=$(string_h) $(INCLUDE_DIR)/request.h
+objects+=request.o
+request.o: $(request_h) request.cpp
+
 runnable_h=$(INCLUDE_DIR)/runnable.h
 objects+=runnable.o
 runnable.o: $(runnable_h) runnable.cpp
@@ -54,7 +63,7 @@ controlclient_h=$(connection_h) $(INCLUDE_DIR)/controlclient.h
 objects+=controlclient.o
 controlclient.o: $(controlclient_h) controlclient.cpp
 
-controlserver_h=$(connection_h) $(INCLUDE_DIR)/controlserver.h
+controlserver_h=$(connection_h) $(request_h) $(INCLUDE_DIR)/controlserver.h
 objects+=controlserver.o
 controlserver.o: $(controlserver_h) controlserver.cpp
 
@@ -71,6 +80,7 @@ objects+=server.o
 server.o: $(server_h) server.cpp
 
 server.a: $(objects)
+       rm -f $@
        $(AR) cq $@ $(objects)
 
 clean: