X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/ffe5447aa2d71b5296cbdd36c48d5f9d59e249af..eb95b779b5006ce4ef16ee1ffc1d15557d31ccef:/Server/src/Makefile?ds=sidebyside

diff --git a/Server/src/Makefile b/Server/src/Makefile
index 683723f..110f072 100644
--- 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
+MODEL_DIR=../../Model
 
 # 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+=-O3
+#CXXFLAGS+=-O2
 #LDFLAGS=-lsocket++ `pkg-config --libs glibmm-2.0 gthread-2.0`
 
 TARGETS=server.a
@@ -46,6 +47,10 @@ string_h=$(INCLUDE_DIR)/string.h
 objects+=string.o
 string.o: $(string_h) string.cpp
 
+httperror_h=$(INCLUDE_DIR)/httperror.h
+objects+=httperror.o
+httperror.o: $(httperror_h) httperror.cpp
+
 httpheaders_h=$(string_h) $(INCLUDE_DIR)/httpheaders.h
 objects+=httpheaders.o
 httpheaders.o: $(httpheaders_h) httpheaders.cpp
@@ -54,6 +59,10 @@ httpmessage_h=$(string_h) $(httpheaders_h) $(INCLUDE_DIR)/httpmessage.h
 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
@@ -62,9 +71,9 @@ command_h=$(string_h) $(httprequest_h) $(INCLUDE_DIR)/command.h
 objects+=command.o
 command.o: $(command_h) command.cpp
 
-httpresponse_h=$(string_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
@@ -74,9 +83,9 @@ connection_h=$(runnable_h) $(INCLUDE_DIR)/connection.h
 objects+=connection.o
 connection.o: $(connection_h) connection.cpp
 
-serverconnection_h=$(connection_h) $(INCLUDE_DIR)/serverconnection.h
-objects+=serverconnection.o
-serverconnection.o: $(serverconnection_h) serverconnection.cpp
+#serverconnection_h=$(connection_h) $(INCLUDE_DIR)/serverconnection.h
+#objects+=serverconnection.o
+#serverconnection.o: $(serverconnection_h) serverconnection.cpp
 
 controlclient_h=$(connection_h) $(command_h) $(INCLUDE_DIR)/controlclient.h
 objects+=controlclient.o
@@ -99,7 +108,7 @@ tcpserver_h=$(connection_h) $(INCLUDE_DIR)/tcpserver.h
 objects+=tcpserver.o
 tcpserver.o: $(tcpserver_h) tcpserver.cpp
 
-server_h=$(tcpserver) $(controlserver_h) $(transmitter_h) \
+server_h=$(tcpserver) $(httpresponse_h) $(controlserver_h) $(transmitter_h) \
 		 $(INCLUDE_DIR)/server.h
 objects+=server.o
 server.o: $(server_h) server.cpp