Pocos cambios a la vista del "usuario":

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

diff --git a/Server/tests/Makefile b/Server/tests/Makefile
index 8933af69b14f07adabac96b0a3f4d6582f3694c6..526d9228d060f832d6d4d483d5c888953b17bd69 100644 (file)
--- a/Server/tests/Makefile
+++ b/Server/tests/Makefile
@@ -26,19 +26,19 @@
 #
 
 # 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
 
 # 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) \
+               `pkg-config --cflags glibmm-2.0 gthread-2.0`
 CXXFLAGS+=-g -DDEBUG
 #CXXFLAGS+=-g
 #CXXFLAGS+=-O3
-LDFLAGS=-lsocket++ -L$(LIB_FILES) `pkg-config --libs glibmm-2.0` \
-               `pkg-config --libs gthread-2.0`
+LDFLAGS=-lsocket++ -L$(LIB_FILES) `pkg-config --libs glibmm-2.0 gthread-2.0`
 
 TARGETS=server_test
 
@@ -50,7 +50,7 @@ $(LIB_FILES)/server.a:
        cd $(LIB_FILES) && $(MAKE)
 
 # Tests
-server_test: $(LIB_FILES)/server.a server_test.cpp
+server_test: $(LIB_FILES)/server.a server_test.o
 
 clean:
        rm -f $(TARGETS) *.o