- Hice una regla para construir la librería estática (server.a) con todos los

  .o de las clases del servidor.
- Me copio de ricky y pongo los .h en un directorio 'include' :)
- Pongo un directorio 'tests' con las pruebas.

diff --git a/Server/src/connection.h b/Server/include/connection.h
similarity index 100%
rename from Server/src/connection.h
rename to Server/include/connection.h

diff --git a/Server/src/controlclient.h b/Server/include/controlclient.h
similarity index 100%
rename from Server/src/controlclient.h
rename to Server/include/controlclient.h

diff --git a/Server/src/controlserver.h b/Server/include/controlserver.h
similarity index 100%
rename from Server/src/controlserver.h
rename to Server/include/controlserver.h

diff --git a/Server/src/receiver.h b/Server/include/receiver.h
similarity index 100%
rename from Server/src/receiver.h
rename to Server/include/receiver.h

diff --git a/Server/src/runnable.h b/Server/include/runnable.h
similarity index 100%
rename from Server/src/runnable.h
rename to Server/include/runnable.h

diff --git a/Server/src/server.h b/Server/include/server.h
similarity index 100%
rename from Server/src/server.h
rename to Server/include/server.h

diff --git a/Server/src/transmitter.h b/Server/include/transmitter.h
similarity index 100%
rename from Server/src/transmitter.h
rename to Server/include/transmitter.h

diff --git a/Server/src/Makefile b/Server/src/Makefile
index 861231cda42527d887020caea225f85dc21b4518..569d18de66f349d56117f08102cb641375edc116 100644 (file)
--- 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

diff --git a/Server/tests/Makefile b/Server/tests/Makefile
new file mode 100644 (file)
index 0000000..8933af6
--- /dev/null
+++ b/Server/tests/Makefile
@@ -0,0 +1,57 @@
+# vim: set noexpandtab tabstop=4 shiftwidth=4:
+#----------------------------------------------------------------------------
+#                                  PlaQui
+#----------------------------------------------------------------------------
+# This file is part of PlaQui.
+#
+# PlaQui is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# PlaQui is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with PlaQui; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA  02111-1307  USA
+#----------------------------------------------------------------------------
+# Creado:  sáb oct 18 21:24:06 ART 2003
+# Autores: Leandro Lucarella <llucare@fi.uba.ar>
+#----------------------------------------------------------------------------
+#
+# $Id$
+#
+
+# Ubicación de archivos .h
+INCLUDE_FILES=../include
+
+# Ubicación de archivos .a
+LIB_FILES=../src
+
+# Opciones para el compilador.
+CXXFLAGS=-ansi -pedantic -Wall -I$(INCLUDE_FILES) \
+               `pkg-config --cflags glibmm-2.0` `pkg-config --cflags gthread-2.0`
+CXXFLAGS+=-g -DDEBUG
+#CXXFLAGS+=-g
+#CXXFLAGS+=-O3
+LDFLAGS=-lsocket++ -L$(LIB_FILES) `pkg-config --libs glibmm-2.0` \
+               `pkg-config --libs gthread-2.0`
+
+TARGETS=server_test
+
+# Regla por defecto.
+all: $(TARGETS)
+
+# Librería de plaqui-server
+$(LIB_FILES)/server.a:
+       cd $(LIB_FILES) && $(MAKE)
+
+# Tests
+server_test: $(LIB_FILES)/server.a server_test.cpp
+
+clean:
+       rm -f $(TARGETS) *.o
+

diff --git a/Server/src/server_test.cpp b/Server/tests/server_test.cpp
similarity index 100%
rename from Server/src/server_test.cpp
rename to Server/tests/server_test.cpp