Se pasa a autoconf + automake.

diff --git a/Server/tests/Makefile b/Server/Makefile.am
similarity index 55%
rename from Server/tests/Makefile
rename to Server/Makefile.am
index 0b66fee04e6b9377e18bd88c771c9c5db713b1ee..7a06192ddf375ab0fe7f3c6e2636916b321b5d67 100644 (file)
--- a/Server/tests/Makefile
+++ b/Server/Makefile.am
@@ -18,47 +18,12 @@
 # with PlaQui; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA
 #----------------------------------------------------------------------------
 # 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
+# Creado:  mar nov 18 23:50:18 ART 2003

 # Autores: Leandro Lucarella <llucare@fi.uba.ar>
 #----------------------------------------------------------------------------
 #
 # $Id$
 #
 
 # Autores: Leandro Lucarella <llucare@fi.uba.ar>
 #----------------------------------------------------------------------------
 #
 # $Id$
 #
 

-# Defino compilador y linker ?
-CC=gcc
-
-# Ubicación de archivos .h
-INCLUDE_BASE_DIR=../include
-INCLUDE_DIR=$(INCLUDE_BASE_DIR)
-
-# Ubicación de archivos .a
-LIB_FILES=../src
-MODEL_DIR=../../Model
-
-# Opciones para el compilador.
-CXXFLAGS=-ansi -pedantic -Wall -I$(INCLUDE_DIR) -I$(MODEL_DIR)/include \
-               `pkg-config --cflags glibmm-2.0 gthread-2.0 libxml-2.0`
-CXXFLAGS+=-g -DDEBUG
-#CXXFLAGS+=-g
-#CXXFLAGS+=-O2
-LDFLAGS=-lsocket++ `pkg-config --libs glibmm-2.0 gthread-2.0` \
-               `xml2-config --libs` #-L$(LIB_FILES)
-
-TARGETS=server_test client_test receiver_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 $(MODEL_DIR)/src/model.a server_test.o
-client_test: $(LIB_FILES)/server.a client_test.o
-receiver_test: $(LIB_FILES)/server.a receiver_test.o
-
-clean:
-       rm -f $(TARGETS) *.o
+SUBDIRS = src tests

 
 

diff --git a/Server/configure.in b/Server/configure.in
new file mode 100644 (file)
index 0000000..fbbe7f8
--- /dev/null
+++ b/Server/configure.in
@@ -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:  mar nov 18 12:28:57 ART 2003
+## Autores: Leandro Lucarella <llucare@fi.uba.ar>
+##----------------------------------------------------------------------------
+##
+## $Id$
+##
+
+AC_INIT(configure.in)
+AM_INIT_AUTOMAKE(plaqui_server, 0.9)
+AM_MAINTAINER_MODE
+
+AC_ISC_POSIX
+AC_PROG_CXX
+AM_PROG_CC_STDC
+AC_PROG_RANLIB
+AC_HEADER_STDC
+
+PKG_CHECK_MODULES(PACKAGE, 
+               libxml-2.0 \
+               sigc++-1.2 \
+               glibmm-2.0 \
+               gthread-2.0)
+
+AC_SUBST(PACKAGE_CFLAGS)
+AC_SUBST(PACKAGE_LIBS)
+
+AC_OUTPUT([
+Makefile
+tests/Makefile
+src/Makefile
+])
+
+echo
+echo "Todo listo. Ahora para compilar solo ejecute make"
+echo
+echo "The PlaQui Developer Team"
+

diff --git a/Server/src/Makefile b/Server/src/Makefile
deleted file mode 100644 (file)
index 6f8e544..0000000
--- a/Server/src/Makefile
+++ /dev/null
@@ -1,122 +0,0 @@
-# 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$
-#
-
-# Directorio con los .h
-INCLUDE_BASE_DIR=../include
-INCLUDE_DIR=$(INCLUDE_BASE_DIR)/plaqui/server
-MODEL_DIR=../../Model
-
-# Opciones para el compilador.
-CXXFLAGS=-ansi -pedantic -Wall -I$(INCLUDE_BASE_DIR)  -I$(MODEL_DIR)/include \
-               `pkg-config --cflags glibmm-2.0 gthread-2.0 libxml-2.0`
-CXXFLAGS+=-g -DDEBUG
-#CXXFLAGS+=-g
-#CXXFLAGS+=-O2
-#LDFLAGS=-lsocket++ `pkg-config --libs glibmm-2.0 gthread-2.0`
-
-TARGETS=server.a
-
-# Regla por defecto.
-all: $(TARGETS)
-
-string_h=$(INCLUDE_DIR)/string.h
-objects+=string.o
-string.o: $(string_h) string.cpp
-
-httperror_h=$(INCLUDE_DIR)/httperror.h
-objects+=httperror.o
-httperror.o: $(httperror_h) httperror.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
-
-httpresponse_h=$(string_h) $(httperror_h) $(httpmessage_h) $(INCLUDE_DIR)/httprequest.h
-objects+=httpresponse.o
-httpresponse.o: $(httpresponse_h) httpresponse.cpp
-
-httprequest_h=$(string_h) $(httpmessage_h) $(INCLUDE_DIR)/httprequest.h
-objects+=httprequest.o
-httprequest.o: $(httprequest_h) httprequest.cpp
-
-command_h=$(string_h) $(httprequest_h) $(INCLUDE_DIR)/command.h
-objects+=command.o
-command.o: $(command_h) command.cpp
-
-plant_h=$(INCLUDE_DIR)/plant.h
-objects+=plant.o
-plant.o: $(plant_h) plant.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) $(command_h) $(INCLUDE_DIR)/controlclient.h
-objects+=controlclient.o
-controlclient.o: $(controlclient_h) controlclient.cpp
-
-controlserver_h=$(connection_h) $(httprequest_h) $(httpresponse_h) \
-                               $(INCLUDE_DIR)/controlserver.h
-objects+=controlserver.o
-controlserver.o: $(controlserver_h) controlserver.cpp
-
-receiver_h=$(connection_h) $(INCLUDE_DIR)/receiver.h
-objects+=receiver.o
-receiver.o: $(receiver_h) receiver.cpp
-
-transmitter_h=$(connection_h) $(INCLUDE_DIR)/transmitter.h
-objects+=transmitter.o
-transmitter.o: $(transmitter_h) transmitter.cpp
-
-tcpserver_h=$(connection_h) $(INCLUDE_DIR)/tcpserver.h
-objects+=tcpserver.o
-tcpserver.o: $(tcpserver_h) tcpserver.cpp
-
-server_h=$(tcpserver) $(httpresponse_h) $(controlserver_h) $(transmitter_h) \
-                $(INCLUDE_DIR)/server.h
-objects+=server.o
-server.o: $(server_h) server.cpp
-
-server.a: $(objects)
-       rm -f $@
-       $(AR) cq $@ $(objects)
-
-clean:
-       rm -f $(TARGETS) *.o
-

diff --git a/Server/src/Makefile.am b/Server/src/Makefile.am
new file mode 100644 (file)
index 0000000..bc7875c
--- /dev/null
+++ b/Server/src/Makefile.am
@@ -0,0 +1,75 @@
+## 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:  mar nov 18 12:28:57 ART 2003
+## Autores: Leandro Lucarella <llucare@fi.uba.ar>
+##----------------------------------------------------------------------------
+##
+## $Id$
+##
+
+INCLUDES = \
+       -I../include \
+       -I../../Model/include \
+       -DDEBUG \
+       -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+       -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+       @PACKAGE_CFLAGS@
+
+##bin_PROGRAMS = plaqui-server
+
+noinst_LIBRARIES = libplaquiserver.a
+
+libplaquiserver_a_SOURCES = \
+       command.cpp \
+       connection.cpp \
+       controlclient.cpp \
+       controlserver.cpp \
+       httperror.cpp \
+       httpheaders.cpp \
+       httpmessage.cpp \
+       httprequest.cpp \
+       httpresponse.cpp \
+       plant.cpp \
+       receiver.cpp \
+       runnable.cpp \
+       server.cpp \
+       string.cpp \
+       tcpserver.cpp \
+       transmitter.cpp \
+       command.h \
+       connection.h \
+       controlclient.h \
+       controlserver.h \
+       httperror.h \
+       httpheaders.h \
+       httpmessage.h \
+       httprequest.h \
+       httpresponse.h \
+       plant.h \
+       receiver.h \
+       runnable.h \
+       server.h \
+       string.h \
+       tcpserver.h \
+       transmitter.h
+
+##plaqui_server_LDADD = @PACKAGE_LIBS@
+

diff --git a/Server/tests/Makefile.am b/Server/tests/Makefile.am
new file mode 100644 (file)
index 0000000..025269f
--- /dev/null
+++ b/Server/tests/Makefile.am
@@ -0,0 +1,60 @@
+## 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:  mié nov 19 00:41:40 ART 2003
+## Autores: Leandro Lucarella <llucare@fi.uba.ar>
+##----------------------------------------------------------------------------
+##
+## $Id$
+##
+
+INCLUDES = \
+       -I../include \
+       -I../../Model/include \
+       -DDEBUG \
+       -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+       -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+       @PACKAGE_CFLAGS@
+
+bin_PROGRAMS = \
+       server_test \
+       client_test \
+       receiver_test
+
+server_test_SOURCES = server_test.cpp
+client_test_SOURCES = client_test.cpp
+receiver_test_SOURCES = receiver_test.cpp
+
+server_test_LDADD = \
+       @PACKAGE_LIBS@ \
+       -lsocket++ \
+       ../src/libplaquiserver.a \
+       ../../Model/src/model.a
+
+client_test_LDADD = \
+       @PACKAGE_LIBS@ \
+       -lsocket++ \
+       ../src/libplaquiserver.a
+
+receiver_test_LDADD = \
+       @PACKAGE_LIBS@ \
+       -lsocket++ \
+       ../src/libplaquiserver.a
+