X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/1eadf77f99288a079f330d14feb6e81dac906cd3..0bf4e9e2336a15ee267bd39b6ac325326fb10d9d:/Server/src/Makefile?ds=sidebyside

diff --git a/Server/src/Makefile b/Server/src/Makefile
index 07f6901..d8e95f3 100644
--- a/Server/src/Makefile
+++ b/Server/src/Makefile
@@ -26,22 +26,50 @@
 #
 
 # Directorio con los .h
-INCLUDE_DIR=../include
+INCLUDE_BASE_DIR=../include
+INCLUDE_DIR=$(INCLUDE_BASE_DIR)/plaqui/server
 
 # Opciones para el compilador.
-CXXFLAGS=-ansi -pedantic -Wall -I$(INCLUDE_DIR) \
-		`pkg-config --cflags glibmm-2.0` `pkg-config --cflags gthread-2.0`
+CXXFLAGS=-ansi -pedantic -Wall -I$(INCLUDE_BASE_DIR) \
+		`pkg-config --cflags glibmm-2.0 gthread-2.0`
 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
 
 # Regla por defecto.
 all: $(TARGETS)
 
+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
+
+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.o: $(runnable_h) runnable.cpp
@@ -50,11 +78,16 @@ connection_h=$(runnable_h) $(INCLUDE_DIR)/connection.h
 objects+=connection.o
 connection.o: $(connection_h) connection.cpp
 
-controlclient_h=$(connection_h) $(INCLUDE_DIR)/controlclient.h
+#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.o: $(controlclient_h) controlclient.cpp
 
-controlserver_h=$(connection_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
 
@@ -66,7 +99,12 @@ transmitter_h=$(connection_h) $(INCLUDE_DIR)/transmitter.h
 objects+=transmitter.o
 transmitter.o: $(transmitter_h) transmitter.cpp
 
-server_h=$(controlserver_h) $(transmitter_h) $(INCLUDE_DIR)/server.h
+tcpserver_h=$(connection_h) $(INCLUDE_DIR)/tcpserver.h
+objects+=tcpserver.o
+tcpserver.o: $(tcpserver_h) tcpserver.cpp
+
+server_h=$(tcpserver) $(httpresponse_h) $(controlserver_h) $(transmitter_h) \
+		 $(INCLUDE_DIR)/server.h
 objects+=server.o
 server.o: $(server_h) server.cpp
 
@@ -76,3 +114,4 @@ server.a: $(objects)
 
 clean:
 	rm -f $(TARGETS) *.o
+