X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/eec4d28bd00dbfce37c9262a959abeb215d90b51..a359eb714e150b2b59856d0056b9880aaaedd128:/Server/tests/Makefile?ds=inline

diff --git a/Server/tests/Makefile b/Server/tests/Makefile
index 8933af6..351525f 100644
--- a/Server/tests/Makefile
+++ b/Server/tests/Makefile
@@ -25,22 +25,27 @@
 # $Id$
 #
 
+# Defino compilador y linker ?
+CC=gcc
+
 # Ubicación de archivos .h
-INCLUDE_FILES=../include
+INCLUDE_BASE_DIR=../include
+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_FILES) \
-		`pkg-config --cflags glibmm-2.0` `pkg-config --cflags 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++ -L$(LIB_FILES) `pkg-config --libs glibmm-2.0` \
-		`pkg-config --libs gthread-2.0`
+#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)
@@ -50,7 +55,10 @@ $(LIB_FILES)/server.a:
 	cd $(LIB_FILES) && $(MAKE)
 
 # Tests
-server_test: $(LIB_FILES)/server.a server_test.cpp
+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