X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/a9cb053146d2f1dc73e536ed87597f458deebea3..eec4d28bd00dbfce37c9262a959abeb215d90b51:/Server/src/Makefile?ds=inline

diff --git a/Server/src/Makefile b/Server/src/Makefile
index 861231c..569d18d 100644
--- a/Server/src/Makefile
+++ b/Server/src/Makefile
@@ -25,51 +25,53 @@
 # $Id$
 #
 
+# Directorio con los .h
+INCLUDE_DIR=../include
+
 # Opciones para el compilador.
-CXXFLAGS=-ansi -pedantic -Wall `pkg-config --cflags glibmm-2.0` `pkg-config --cflags gthread-2.0`
+CXXFLAGS=-ansi -pedantic -Wall -I$(INCLUDE_DIR) \
+		`pkg-config --cflags glibmm-2.0` `pkg-config --cflags gthread-2.0`
 CXXFLAGS+=-g -DDEBUG
 #CXXFLAGS+=-g
 #CXXFLAGS+=-O3
-LDFLAGS=-lsocket++ `pkg-config --libs glibmm-2.0` `pkg-config --libs gthread-2.0`
-
-TARGETS=connection.o controlclient.o controlserver.o receiver.o transmitter.o \
-	server.o
+#LDFLAGS=-lsocket++ `pkg-config --libs glibmm-2.0` \
+		`pkg-config --libs gthread-2.0`
 
-TESTS=server_test
+TARGETS=server.a
 
 # Regla por defecto.
-all: $(TARGETS) $(TESTS)
+all: $(TARGETS)
 
-runnable_h=runnable.h
+runnable_h=$(INCLUDE_DIR)/runnable.h
 objects+=runnable.o
 runnable.o: $(runnable_h) runnable.cpp
 
-connection_h=$(runnable_h) connection.h
+connection_h=$(runnable_h) $(INCLUDE_DIR)/connection.h
 objects+=connection.o
 connection.o: $(connection_h) connection.cpp
 
-controlclient_h=$(connection_h) controlclient.h
+controlclient_h=$(connection_h) $(INCLUDE_DIR)/controlclient.h
 objects+=controlclient.o
 controlclient.o: $(controlclient_h) controlclient.cpp
 
-controlserver_h=$(connection_h) controlserver.h
+controlserver_h=$(connection_h) $(INCLUDE_DIR)/controlserver.h
 objects+=controlserver.o
 controlserver.o: $(controlserver_h) controlserver.cpp
 
-receiver_h=$(connection_h) receiver.h
+receiver_h=$(connection_h) $(INCLUDE_DIR)/receiver.h
 objects+=receiver.o
 receiver.o: $(receiver_h) receiver.cpp
 
-transmitter_h=$(connection_h) transmitter.h
+transmitter_h=$(connection_h) $(INCLUDE_DIR)/transmitter.h
 objects+=transmitter.o
 transmitter.o: $(transmitter_h) transmitter.cpp
 
-server_h=$(controlserver_h) $(transmitter_h) server.h
+server_h=$(controlserver_h) $(transmitter_h) $(INCLUDE_DIR)/server.h
 objects+=server.o
 server.o: $(server_h) server.cpp
 
-# Tests
-server_test: $(objects) server_test.cpp
+server.a: $(objects)
+	$(AR) cq $@ $(objects)
 
 clean:
-	rm -f $(TARGETS) $(TESTS) *.o
+	rm -f $(TARGETS) *.o