- 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 24792909457bfd56e0b6d4858dca6c1060a4f78f..351525fdbbb86bee73499a29ae554de2f5a77fec 100644 (file)
--- a/Server/tests/Makefile
+++ b/Server/tests/Makefile
@@ -34,14 +34,16 @@ 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+=-O2
-LDFLAGS=-lsocket++ `pkg-config --libs glibmm-2.0 gthread-2.0` #-L$(LIB_FILES)
+LDFLAGS=-lsocket++ `pkg-config --libs glibmm-2.0 gthread-2.0` \
+               `xml2-config --libs` #-L$(LIB_FILES)
 
 TARGETS=server_test client_test
 
@@ -53,7 +55,7 @@ $(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