Agrego 2 ejemplos con problemas con la logica de control. El cliente la

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

diff --git a/Server/src/Makefile.am b/Server/src/Makefile.am
index bc7875ca4b32df9404aedcb7c32d474d6a98eec9..5e1cc84f259826100acc7ca0bb7662bdd9ce31de 100644 (file)
--- a/Server/src/Makefile.am
+++ b/Server/src/Makefile.am
@@ -28,16 +28,17 @@
 INCLUDES = \
        -I../include \
        -I../../Model/include \
 INCLUDES = \
        -I../include \
        -I../../Model/include \

-       -DDEBUG \
+##     -DDEBUG \

        -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
        -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        @PACKAGE_CFLAGS@
 
        -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
        -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        @PACKAGE_CFLAGS@
 

-##bin_PROGRAMS = plaqui-server
+bin_PROGRAMS = plaqui-server

 
 noinst_LIBRARIES = libplaquiserver.a
 
 
 noinst_LIBRARIES = libplaquiserver.a
 

-libplaquiserver_a_SOURCES = \
+plaqui_server_SOURCES = \
+       main.cpp \

        command.cpp \
        connection.cpp \
        controlclient.cpp \
        command.cpp \
        connection.cpp \
        controlclient.cpp \


@@ -49,6 +50,8 @@ libplaquiserver_a_SOURCES = \
        httpresponse.cpp \
        plant.cpp \
        receiver.cpp \
        httpresponse.cpp \
        plant.cpp \
        receiver.cpp \

+       response.cpp \
+       response_parser.cpp \

        runnable.cpp \
        server.cpp \
        string.cpp \
        runnable.cpp \
        server.cpp \
        string.cpp \


@@ -65,11 +68,36 @@ libplaquiserver_a_SOURCES = \
        httpresponse.h \
        plant.h \
        receiver.h \
        httpresponse.h \
        plant.h \
        receiver.h \

+       response.h \

        runnable.h \
        server.h \
        string.h \
        tcpserver.h \
        transmitter.h
 
        runnable.h \
        server.h \
        string.h \
        tcpserver.h \
        transmitter.h
 

-##plaqui_server_LDADD = @PACKAGE_LIBS@
+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 \
+       response.cpp \
+       response_parser.cpp \
+       runnable.cpp \
+       server.cpp \
+       string.cpp \
+       tcpserver.cpp \
+       transmitter.cpp
+
+plaqui_server_LDADD = \
+       @PACKAGE_LIBS@ \
+       -lsocket++ \
+       ../src/libplaquiserver.a \
+       ../../Model/src/libplaquimodel.a