- Se arregla el bug de ControlClient::get_host() y ControlClient::get_port().

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

diff --git a/Server/tests/Makefile b/Server/tests/Makefile
index 0210ffe18fc530832936fa5424454aedf7ab4a48..351525fdbbb86bee73499a29ae554de2f5a77fec 100644 (file)
--- a/Server/tests/Makefile
+++ b/Server/tests/Makefile
@@ -34,16 +34,18 @@ INCLUDE_DIR=$(INCLUDE_BASE_DIR)
 
 # Ubicación de archivos .a
 LIB_FILES=../src
+MODEL_DIR=../../Model
 
 # Opciones para el compilador.
-CXXFLAGS=-ansi -pedantic -Wall -I$(INCLUDE_DIR) \
-               `pkg-config --cflags glibmm-2.0 gthread-2.0`
+CXXFLAGS=-ansi -pedantic -Wall -I$(INCLUDE_DIR) -I$(MODEL_DIR)/include \
+               `pkg-config --cflags glibmm-2.0 gthread-2.0` `xml2-config --cflags`
 CXXFLAGS+=-g -DDEBUG
 #CXXFLAGS+=-g
-#CXXFLAGS+=-O3
-LDFLAGS=-lsocket++ `pkg-config --libs glibmm-2.0 gthread-2.0` #-L$(LIB_FILES)
+#CXXFLAGS+=-O2
+LDFLAGS=-lsocket++ `pkg-config --libs glibmm-2.0 gthread-2.0` \
+               `xml2-config --libs` #-L$(LIB_FILES)
 
-TARGETS=server_test
+TARGETS=server_test client_test
 
 # Regla por defecto.
 all: $(TARGETS)
@@ -53,7 +55,10 @@ $(LIB_FILES)/server.a:
        cd $(LIB_FILES) && $(MAKE)
 
 # Tests
-server_test: $(LIB_FILES)/server.a server_test.o
+server_test: $(LIB_FILES)/server.a $(MODEL_DIR)/src/model.a server_test.o
+
+# Tests
+client_test: $(LIB_FILES)/server.a client_test.o
 
 clean:
        rm -f $(TARGETS) *.o