agrego las compuertas pero todavia no hacen nada, ademas tengo un conflicto con el...

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

diff --git a/Server/src/Makefile b/Server/src/Makefile
index 683723f899a16f627cbac9d2c09c7d9be4d322c1..c998e98ae9c69d0518d7521e7ab2d3b58a637029 100644 (file)
--- a/Server/src/Makefile
+++ b/Server/src/Makefile
@@ -46,6 +46,10 @@ string_h=$(INCLUDE_DIR)/string.h
 objects+=string.o
 string.o: $(string_h) string.cpp
 
 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
 httpheaders_h=$(string_h) $(INCLUDE_DIR)/httpheaders.h
 objects+=httpheaders.o
 httpheaders.o: $(httpheaders_h) httpheaders.cpp


@@ -62,7 +66,7 @@ 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) $(httpmessage_h) $(INCLUDE_DIR)/httprequest.h
+httpresponse_h=$(string_h) $(httperror_h) $(httpmessage_h) $(INCLUDE_DIR)/httprequest.h

 objects+=httpresponse.o
 httpresponse.o: $(httpresponse_h) httpresponse.cpp
 
 objects+=httpresponse.o
 httpresponse.o: $(httpresponse_h) httpresponse.cpp
 


@@ -74,9 +78,9 @@ 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) $(command_h) $(INCLUDE_DIR)/controlclient.h
 objects+=controlclient.o
 
 controlclient_h=$(connection_h) $(command_h) $(INCLUDE_DIR)/controlclient.h
 objects+=controlclient.o


@@ -99,7 +103,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