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 d92f547d9a8d94a590d0509b9886324c7b7872fe..c998e98ae9c69d0518d7521e7ab2d3b58a637029 100644 (file)
--- a/Server/src/Makefile
+++ b/Server/src/Makefile
@@ -46,9 +46,29 @@ 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
+
+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
+
+httpresponse_h=$(string_h) $(httperror_h) $(httpmessage_h) $(INCLUDE_DIR)/httprequest.h
+objects+=httpresponse.o
+httpresponse.o: $(httpresponse_h) httpresponse.cpp

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


@@ -58,15 +78,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
 


@@ -82,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


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

+