- Se levanta una planta por defecto desde un archivo (prueba.xml).

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

diff --git a/Server/src/Makefile b/Server/src/Makefile
index 76ab99b5b833b4868039855b89b9051cf2789ab0..110f072a9e1761b29fa2717b10ab28a13d6bf837 100644 (file)
--- a/Server/src/Makefile
+++ b/Server/src/Makefile
@@ -28,15 +28,15 @@
 # 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` `pkg-config --cflags 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
-#LDFLAGS=-lsocket++ `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`

 
 TARGETS=server.a
 
 
 TARGETS=server.a
 


@@ -47,9 +47,33 @@ string_h=$(INCLUDE_DIR)/string.h
 objects+=string.o
 string.o: $(string_h) string.cpp
 
 objects+=string.o
 string.o: $(string_h) string.cpp
 

-request_h=$(string_h) $(INCLUDE_DIR)/request.h
-objects+=request.o
-request.o: $(request_h) request.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
+
+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
+
+command_h=$(string_h) $(httprequest_h) $(INCLUDE_DIR)/command.h
+objects+=command.o
+command.o: $(command_h) command.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


@@ -59,15 +83,16 @@ connection_h=$(runnable_h) $(INCLUDE_DIR)/connection.h
 objects+=connection.o
 connection.o: $(connection_h) connection.cpp
 
 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) $(INCLUDE_DIR)/controlclient.h
+controlclient_h=$(connection_h) $(command_h) $(INCLUDE_DIR)/controlclient.h

 objects+=controlclient.o
 controlclient.o: $(controlclient_h) controlclient.cpp
 
 objects+=controlclient.o
 controlclient.o: $(controlclient_h) controlclient.cpp
 

-controlserver_h=$(connection_h) $(request_h) $(INCLUDE_DIR)/controlserver.h
+controlserver_h=$(connection_h) $(httprequest_h) $(httpresponse_h) \
+                               $(INCLUDE_DIR)/controlserver.h

 objects+=controlserver.o
 controlserver.o: $(controlserver_h) controlserver.cpp
 
 objects+=controlserver.o
 controlserver.o: $(controlserver_h) controlserver.cpp
 


@@ -83,7 +108,7 @@ tcpserver_h=$(connection_h) $(INCLUDE_DIR)/tcpserver.h
 objects+=tcpserver.o
 tcpserver.o: $(tcpserver_h) tcpserver.cpp
 
 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
                 $(INCLUDE_DIR)/server.h
 objects+=server.o
 server.o: $(server_h) server.cpp


@@ -94,3 +119,4 @@ server.a: $(objects)
 
 clean:
        rm -f $(TARGETS) *.o
 
 clean:
        rm -f $(TARGETS) *.o

+