Se pone un poco mas de orden. Desaparece la ControlClient::signal_connected().

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

diff --git a/Server/src/Makefile.am b/Server/src/Makefile.am
index bc7875ca4b32df9404aedcb7c32d474d6a98eec9..7b874b5ac10bfe0cb3ab4f257ebee969b65bec28 100644 (file)
--- a/Server/src/Makefile.am
+++ b/Server/src/Makefile.am
@@ -33,11 +33,12 @@ INCLUDES = \
        -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        @PACKAGE_CFLAGS@
 
        -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 \


@@ -71,5 +72,27 @@ libplaquiserver_a_SOURCES = \
        tcpserver.h \
        transmitter.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 \
+       runnable.cpp \
+       server.cpp \
+       string.cpp \
+       tcpserver.cpp \
+       transmitter.cpp
+
+plaqui_server_LDADD = \
+       @PACKAGE_LIBS@ \
+       -lsocket++ \
+       ../src/libplaquiserver.a \
+       ../../Model/src/libplaquimodel.a