Restore compilation of loggraph, extract code layout of kernel's message dialog into...

[vlp.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9aa17e31a933e02e1a7ebd86597149c2fdb5438f..410de45e6cf49017855ee125901676c830d96bf4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,10 +20,10 @@ EXTRA_DIST = \
        doc/CodingStyle \
        doc/vlp.cfg.sample
 
-#   bin/loggraph   \
 #  bin/loghelp
 
 bin_PROGRAMS = \
+  bin/loggraph   \
   bin/lognet \
   bin/logker \
   bin/logint \
@@ -32,7 +32,7 @@ bin_PROGRAMS = \
   bin/logcomp
 
 BUILT_SOURCES = \
-  src/graph/loggraph.moc \
+  src/graph/loggraph.moc.cpp \
   src/net/lognet.moc.cpp \
   src/kernel/kernel.moc.cpp \
   src/edit/editor.moc.cpp \
@@ -40,11 +40,13 @@ BUILT_SOURCES = \
   src/preproc/prep.moc.cpp \
   src/help/help.moc
 
-bin_loggraph_SOURCES = src/graph/loggraph.cpp src/graph/loggraph.moc
+bin_loggraph_SOURCES = src/graph/loggraph.cpp src/graph/loggraph.moc.cpp
 bin_loggraph_CPPFLAGS = $(bin_loggraph_CFLAGS)
 bin_loggraph_LDADD = $(bin_loggraph_LIBS)
-src/graph/loggraph.moc: 
-       $(MOC) -i src/graph/loggraph.cpp -o src/graph/loggraph.moc
+bin_lognet_HEADERS = \
+       src/graph/loggraph.h
+src/graph/loggraph.moc.cpp:
+       $(MOC) src/graph/loggraph.h -o src/graph/loggraph.moc.cpp
 
 clean-loggraph-extra:
        rm -f src/graph/*.moc.cpp
@@ -68,21 +70,29 @@ clean-lognet-extra:
 bin_logker_SOURCES = \
        src/kernel/kernel.cpp \
        src/kernel/kernel.moc.cpp \
+       src/kernel/ConnectDialog.cpp \
+       src/kernel/KillDialog.cpp \
        src/kernel/LockDialog.cpp \
        src/kernel/OptionsDialog.cpp \
        src/kernel/OptionsDialog.moc.cpp \
-       src/kernel/KillDialog.cpp \
-       src/kernel/ConnectDialog.cpp \
+       src/kernel/MessageDialog.cpp \
        src/global/vlp/config.cpp
 bin_logker_CPPFLAGS = $(bin_logker_CFLAGS)
 bin_logker_LDADD = $(bin_logker_LIBS) -lconfig++ -lX11
 bin_logkerdir = src/kernel
 bin_logker_HEADERS = \
        src/kernel/kernel.h \
+       src/kernel/ConnectDialog.h \
+       src/kernel/KillDialog.h \
        src/kernel/LockDialog.h \
        src/kernel/OptionsDialog.h \
-       src/kernel/KillDialog.h \
-       src/kernel/ConnectDialog.h \
+       src/kernel/MessageDialog.h \
+       src/kernel/ui/KernelWindow.h \
+       src/kernel/ui/dialogs/ConnectDialog.h \
+       src/kernel/ui/dialogs/KillDialog.h \
+       src/kernel/ui/dialogs/LockDialog.h \
+       src/kernel/ui/dialogs/OptionsDialog.h \
+       src/kernel/ui/dialogs/MessageDialog.h \
        src/global/vlp/config.h
 src/kernel/kernel.moc.cpp: \
                src/kernel/kernel.h \
@@ -90,7 +100,8 @@ src/kernel/kernel.moc.cpp: \
                src/kernel/ui/dialogs/LockDialog.h \
                src/kernel/ui/dialogs/OptionsDialog.h \
                src/kernel/ui/dialogs/KillDialog.h \
-               src/kernel/ui/dialogs/ConnectDialog.h
+               src/kernel/ui/dialogs/ConnectDialog.h \
+               src/kernel/ui/dialogs/MessageDialog.h
        moc-qt4 src/kernel/kernel.h -o src/kernel/kernel.moc.cpp
        moc-qt4 src/kernel/OptionsDialog.h -o src/kernel/OptionsDialog.moc.cpp
 #      $(MOC) -i src/kernel/kernel.cpp -o src/kernel/kernel.moc
@@ -110,6 +121,9 @@ src/kernel/ui/dialogs/KillDialog.h:
 src/kernel/ui/dialogs/ConnectDialog.h:
        uic src/kernel/ui/dialogs/ConnectDialog.ui -o src/kernel/ui/dialogs/ConnectDialog.h
 
+src/kernel/ui/dialogs/MessageDialog.h:
+       uic src/kernel/ui/dialogs/MessageDialog.ui -o src/kernel/ui/dialogs/MessageDialog.h
+
 
 clean-logker-extra:
        rm -f src/kernel/*.moc