- Se agrega una planta de prueba (usando Simulator).

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

diff --git a/Server/src/Makefile b/Server/src/Makefile
index c998e98ae9c69d0518d7521e7ab2d3b58a637029..110f072a9e1761b29fa2717b10ab28a13d6bf837 100644 (file)
--- a/Server/src/Makefile
+++ b/Server/src/Makefile
@@ -28,13 +28,14 @@
 # Directorio con los .h
 INCLUDE_BASE_DIR=../include
 INCLUDE_DIR=$(INCLUDE_BASE_DIR)/plaqui/server
 # Directorio con los .h
 INCLUDE_BASE_DIR=../include
 INCLUDE_DIR=$(INCLUDE_BASE_DIR)/plaqui/server

+MODEL_DIR=../../Model

 
 # Opciones para el compilador.
 
 # Opciones para el compilador.

-CXXFLAGS=-ansi -pedantic -Wall -I$(INCLUDE_BASE_DIR) \
-               `pkg-config --cflags glibmm-2.0 gthread-2.0`
+CXXFLAGS=-ansi -pedantic -Wall -I$(INCLUDE_BASE_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
+#CXXFLAGS+=-O2

 #LDFLAGS=-lsocket++ `pkg-config --libs glibmm-2.0 gthread-2.0`
 
 TARGETS=server.a
 #LDFLAGS=-lsocket++ `pkg-config --libs glibmm-2.0 gthread-2.0`
 
 TARGETS=server.a


@@ -58,6 +59,10 @@ httpmessage_h=$(string_h) $(httpheaders_h) $(INCLUDE_DIR)/httpmessage.h
 objects+=httpmessage.o
 httpmessage.o: $(httpmessage_h) httpmessage.cpp
 
 objects+=httpmessage.o
 httpmessage.o: $(httpmessage_h) httpmessage.cpp
 

+httpresponse_h=$(string_h) $(httperror_h) $(httpmessage_h) $(INCLUDE_DIR)/httprequest.h
+objects+=httpresponse.o
+httpresponse.o: $(httpresponse_h) httpresponse.cpp
+

 httprequest_h=$(string_h) $(httpmessage_h) $(INCLUDE_DIR)/httprequest.h
 objects+=httprequest.o
 httprequest.o: $(httprequest_h) httprequest.cpp
 httprequest_h=$(string_h) $(httpmessage_h) $(INCLUDE_DIR)/httprequest.h
 objects+=httprequest.o
 httprequest.o: $(httprequest_h) httprequest.cpp


@@ -66,9 +71,9 @@ command_h=$(string_h) $(httprequest_h) $(INCLUDE_DIR)/command.h
 objects+=command.o
 command.o: $(command_h) command.cpp
 
 objects+=command.o
 command.o: $(command_h) command.cpp
 

-httpresponse_h=$(string_h) $(httperror_h) $(httpmessage_h) $(INCLUDE_DIR)/httprequest.h
-objects+=httpresponse.o
-httpresponse.o: $(httpresponse_h) httpresponse.cpp
+plant_h=$(INCLUDE_DIR)/plant.h
+objects+=plant.o
+plant.o: $(plant_h) plant.cpp

 
 runnable_h=$(INCLUDE_DIR)/runnable.h
 objects+=runnable.o
 
 runnable_h=$(INCLUDE_DIR)/runnable.h
 objects+=runnable.o