* Se modifica la estructura de directorios : src include dialogs y pixmaps

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

diff --git a/Server/tests/Makefile b/Server/tests/Makefile
index c5bfc639a1c37f99a09e0ea3b885b698eb5c26a0..0885bca34b06f67a0631f6fe05fd9510a6ff5f7a 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
 
 # Ubicación de archivos .a
 LIB_FILES=../src

+MODEL_DIR=../../Model

 
 # Opciones para el compilador.
 
 # 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+=-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 client_test
+TARGETS=server_test client_test receiver_test

 
 # Regla por defecto.
 all: $(TARGETS)
 
 # Regla por defecto.
 all: $(TARGETS)


@@ -53,10 +55,9 @@ $(LIB_FILES)/server.a:
        cd $(LIB_FILES) && $(MAKE)
 
 # Tests
        cd $(LIB_FILES) && $(MAKE)
 
 # Tests

-server_test: $(LIB_FILES)/server.a server_test.o
-
-# Tests
+server_test: $(LIB_FILES)/server.a $(MODEL_DIR)/src/model.a server_test.o

 client_test: $(LIB_FILES)/server.a client_test.o
 client_test: $(LIB_FILES)/server.a client_test.o

+receiver_test: $(LIB_FILES)/server.a receiver_test.o

 
 clean:
        rm -f $(TARGETS) *.o
 
 clean:
        rm -f $(TARGETS) *.o