Se corrige el bug encontrado por Nico.

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

diff --git a/Server/src/Makefile b/Server/src/Makefile
index 569d18de66f349d56117f08102cb641375edc116..76ab99b5b833b4868039855b89b9051cf2789ab0 100644 (file)
--- a/Server/src/Makefile
+++ b/Server/src/Makefile
@@ -26,10 +26,11 @@
 #
 
 # Directorio con los .h
 #
 
 # Directorio con los .h

-INCLUDE_DIR=../include
+INCLUDE_BASE_DIR=../include
+INCLUDE_DIR=$(INCLUDE_BASE_DIR)/plaqui/server

 
 # Opciones para el compilador.
 
 # Opciones para el compilador.

-CXXFLAGS=-ansi -pedantic -Wall -I$(INCLUDE_DIR) \
+CXXFLAGS=-ansi -pedantic -Wall -I$(INCLUDE_BASE_DIR) \

                `pkg-config --cflags glibmm-2.0` `pkg-config --cflags gthread-2.0`
 CXXFLAGS+=-g -DDEBUG
 #CXXFLAGS+=-g
                `pkg-config --cflags glibmm-2.0` `pkg-config --cflags gthread-2.0`
 CXXFLAGS+=-g -DDEBUG
 #CXXFLAGS+=-g


@@ -42,6 +43,14 @@ TARGETS=server.a
 # Regla por defecto.
 all: $(TARGETS)
 
 # Regla por defecto.
 all: $(TARGETS)
 

+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
+

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


@@ -50,11 +59,15 @@ 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
+

 controlclient_h=$(connection_h) $(INCLUDE_DIR)/controlclient.h
 objects+=controlclient.o
 controlclient.o: $(controlclient_h) controlclient.cpp
 
 controlclient_h=$(connection_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) $(request_h) $(INCLUDE_DIR)/controlserver.h

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


@@ -66,11 +79,17 @@ transmitter_h=$(connection_h) $(INCLUDE_DIR)/transmitter.h
 objects+=transmitter.o
 transmitter.o: $(transmitter_h) transmitter.cpp
 
 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) $(controlserver_h) $(transmitter_h) \
+                $(INCLUDE_DIR)/server.h

 objects+=server.o
 server.o: $(server_h) server.cpp
 
 server.a: $(objects)
 objects+=server.o
 server.o: $(server_h) server.cpp
 
 server.a: $(objects)

+       rm -f $@

        $(AR) cq $@ $(objects)
 
 clean:
        $(AR) cq $@ $(objects)
 
 clean: