subo el workplace.h y decime si asi esta bien puesto el comentario

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

diff --git a/Client/src/Makefile.am b/Client/src/Makefile.am
index 5d24ed904c2b9671769631e0a11ec52de3db7497..045a53ee382aaf0491782a2631406d3f6a3c9247 100644 (file)
--- a/Client/src/Makefile.am
+++ b/Client/src/Makefile.am
@@ -2,6 +2,7 @@
 
 INCLUDES = \
        -I../include \
 
 INCLUDES = \
        -I../include \

+       -I../../Server/include \

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


@@ -9,9 +10,21 @@ INCLUDES = \
 bin_PROGRAMS = plaqui-client 
 
 plaqui_client_SOURCES = main.cpp \
 bin_PROGRAMS = plaqui-client 
 
 plaqui_client_SOURCES = main.cpp \

-                                                                                               menu_bar.cpp \
-                                                                                               dlg_conectar.cpp
+                                                                                               principal.cpp \
+                                                                                               dlg_conectar.cpp \
+                                                                                               dlg_property.cpp \
+                                                                                               item.cpp \
+                                                                                               item_pump.cpp \
+                                                                                               item_codo.cpp \
+                                                                                               item_conduct.cpp \
+                                                                                               item_exclusa.cpp \
+                                                                                               item_tank.cpp \
+                                                                                               item_union.cpp \
+                                                                                               item_drain.cpp \
+                                                                                               item_or.cpp \
+                                                                                               item_and.cpp \
+                                                                                               item_not.cpp

 
 

-plaqui_client_LDADD = @PACKAGE_LIBS@
+plaqui_client_LDADD = @PACKAGE_LIBS@ ../../Server/src/libplaquiserver.a -lsocket++