Se mueve el mutex a la clase que tiene el recurso a proteger.

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

diff --git a/Server/src/Makefile b/Server/src/Makefile
index 146f7a87f477b2bb1ecdfe6eeba0e1c52fe11c8d..d92f547d9a8d94a590d0509b9886324c7b7872fe 100644 (file)
--- a/Server/src/Makefile
+++ b/Server/src/Makefile
@@ -25,32 +25,71 @@
 # $Id$
 #
 
 # $Id$
 #
 

+# Directorio con los .h
+INCLUDE_BASE_DIR=../include
+INCLUDE_DIR=$(INCLUDE_BASE_DIR)/plaqui/server
+

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

-CXXFLAGS=-ansi -pedantic -Wall -g
-LDFLAGS=-lsocket++
+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 gthread-2.0`

 
 

-TARGETS=connection.o controlclient.o controlserver.o receiver.o transmitter.o \
-       server.o
+TARGETS=server.a

 
 # Regla por defecto.
 all: $(TARGETS)
 
 
 # Regla por defecto.
 all: $(TARGETS)
 

-runnable_h=runnable.h
+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
+
+connection_h=$(runnable_h) $(INCLUDE_DIR)/connection.h
+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
+
+controlserver_h=$(connection_h) $(request_h) $(INCLUDE_DIR)/controlserver.h
+objects+=controlserver.o
+controlserver.o: $(controlserver_h) controlserver.cpp

 
 

-connection_h=$(runnable_h) connection.h
-connection.o: $(connection_h)
+receiver_h=$(connection_h) $(INCLUDE_DIR)/receiver.h
+objects+=receiver.o
+receiver.o: $(receiver_h) receiver.cpp

 
 

-controlclient_h=$(connection_h) controlclient.h
-controlclient.o: $(controlclient_h)
+transmitter_h=$(connection_h) $(INCLUDE_DIR)/transmitter.h
+objects+=transmitter.o
+transmitter.o: $(transmitter_h) transmitter.cpp

 
 

-controlserver_h=$(connection_h) controlserver.h
-controlserver.o: $(controlserver_h)
+tcpserver_h=$(connection_h) $(INCLUDE_DIR)/tcpserver.h
+objects+=tcpserver.o
+tcpserver.o: $(tcpserver_h) tcpserver.cpp

 
 

-receiver_h=$(connection_h) receiver.h
-receiver.o: $(receiver_h)
+server_h=$(tcpserver) $(controlserver_h) $(transmitter_h) \
+                $(INCLUDE_DIR)/server.h
+objects+=server.o
+server.o: $(server_h) server.cpp

 
 

-transmitter_h=$(connection_h) transmitter.h
-transmitter.o: $(transmitter_h)
+server.a: $(objects)
+       rm -f $@
+       $(AR) cq $@ $(objects)

 
 clean:
        rm -f $(TARGETS) *.o
 
 clean:
        rm -f $(TARGETS) *.o