Se corrigen algunos errores. Tengo un problema con la sobrecarga del operator>> ...

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

diff --git a/Server/src/Makefile b/Server/src/Makefile
index 76ab99b5b833b4868039855b89b9051cf2789ab0..cac6988b1996f65f743c1eca604583c6c2348aa6 100644 (file)
--- a/Server/src/Makefile
+++ b/Server/src/Makefile
@@ -31,12 +31,11 @@ INCLUDE_DIR=$(INCLUDE_BASE_DIR)/plaqui/server
 
 # Opciones para el compilador.
 CXXFLAGS=-ansi -pedantic -Wall -I$(INCLUDE_BASE_DIR) \
-               `pkg-config --cflags glibmm-2.0` `pkg-config --cflags gthread-2.0`
+               `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`
+#LDFLAGS=-lsocket++ `pkg-config --libs glibmm-2.0 gthread-2.0`
 
 TARGETS=server.a
 
@@ -47,9 +46,21 @@ string_h=$(INCLUDE_DIR)/string.h
 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
+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
+
+httpresponse_h=$(string_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
@@ -67,7 +78,8 @@ controlclient_h=$(connection_h) $(INCLUDE_DIR)/controlclient.h
 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
 
@@ -94,3 +106,4 @@ server.a: $(objects)
 
 clean:
        rm -f $(TARGETS) *.o
+