3.1.2 Alpha 5

[vlp.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 782199dad86ff50a309081978228acf91952971b..bc7d22323caa1872041798bbb70ef4c21af8bc18 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,8 @@ EXTRA_DIST = \
        doc/InstallVLP.html \
        doc/INSTALL_VLP.pdf \
        doc/CodingStyle \
-       doc/vlp.cfg.sample
+       doc/vlp.cfg.sample \
+       data
 
 bin_PROGRAMS = \
   bin/loggraph \
@@ -62,18 +63,50 @@ clean-lognet-extra:
        rm -f bin/modules/lognet
        rm -f bin/lognet
        
-bin_logker_SOURCES = src/kernel/kernel.cpp src/kernel/kernel.moc.cpp
+bin_logker_SOURCES = \
+       src/kernel/kernel.cpp \
+       src/kernel/kernel.moc.cpp \
+       src/kernel/options.moc.cpp
 bin_logker_CPPFLAGS = $(bin_logker_CFLAGS)
 bin_logker_LDADD = $(bin_logker_LIBS)
-bin_logkerdir = src/kernel
+bin_logkerdir = src/kernel src/kernel/ui src/kernel/ui/dialogs
 bin_logker_HEADERS = \
-       src/kernel/kernel.h
-src/kernel/kernel.moc.cpp: src/kernel/kernel.h
+       src/kernel/kernel.h \
+       src/kernel/send-message.h \
+       src/kernel/kill-interpreter.h \
+       src/kernel/options.h \
+       src/kernel/ui/main-window.h \
+       src/kernel/ui/dialogs/connect.h \
+       src/kernel/ui/dialogs/options.h \
+       src/kernel/ui/dialogs/kill-interpreter.h \
+       src/kernel/ui/dialogs/send-message.h
+
+src/kernel/ui/main-window.h: data/kernel/main-window.ui
+       if [ ! -d src/kernel/ui ]; then mkdir -p src/kernel/ui; fi
+       uic-qt4 data/kernel/main-window.ui -o src/kernel/ui/main-window.h
+src/kernel/ui/dialogs/connect.h: data/kernel/dialogs/connect.ui
+       if [ ! -d src/kernel/ui/dialogs ]; then mkdir -p src/kernel/ui/dialogs; fi
+       uic-qt4 data/kernel/dialogs/connect.ui -o src/kernel/ui/dialogs/connect.h
+src/kernel/ui/dialogs/options.h: data/kernel/dialogs/options.ui
+       if [ ! -d src/kernel/ui/dialogs ]; then mkdir -p src/kernel/ui/dialogs; fi
+       uic-qt4 data/kernel/dialogs/options.ui -o src/kernel/ui/dialogs/options.h
+src/kernel/ui/dialogs/kill-interpreter.h: data/kernel/dialogs/kill-interpreter.ui
+       if [ ! -d src/kernel/ui/dialogs ]; then mkdir -p src/kernel/ui/dialogs; fi
+       uic-qt4 data/kernel/dialogs/kill-interpreter.ui -o src/kernel/ui/dialogs/kill-interpreter.h
+src/kernel/ui/dialogs/send-message.h: data/kernel/dialogs/send-message.ui
+       if [ ! -d src/kernel/ui/dialogs ]; then mkdir -p src/kernel/ui/dialogs; fi
+       uic-qt4 data/kernel/dialogs/send-message.ui -o src/kernel/ui/dialogs/send-message.h
+
+src/kernel/kernel.moc.cpp: $(bin_logker_HEADERS)
        moc-qt4 src/kernel/kernel.h -o src/kernel/kernel.moc.cpp
 #      $(MOC) -i src/kernel/kernel.cpp -o src/kernel/kernel.moc
+
+src/kernel/options.moc.cpp:
+       moc-qt4 src/kernel/options.h -o src/kernel/options.moc.cpp
        
 clean-logker-extra:
-       rm -f src/kernel/*.moc
+       rm -rf src/kernel/ui
+       rm -f src/kernel/*.moc.cpp
        rm -f bin/logker
        
 bin_logint_SOURCES = \
@@ -117,19 +150,37 @@ bin_logint_HEADERS = \
 clean-logint-extra:
        rm -f bin/logint
 
-bin_logedit_SOURCES = src/edit/editor.cpp src/edit/editor.moc.cpp 
+bin_logedit_SOURCES = \
+       src/edit/editor.cpp \
+       src/edit/editor.moc.cpp \
+       src/edit/my_edit.moc.cpp
 bin_logedit_CPPFLAGS = $(bin_logedit_CFLAGS) 
 bin_logedit_LDADD = $(bin_logedit_LIBS)
 bin_logeditdir = src/edit
 bin_logedit_HEADERS =\
-       src/edit/editor.h
+       src/edit/editor.h \
+       src/edit/my_edit.h \
+       src/edit/editor-properties.h \
+       src/edit/ui/editor-window.h \
+       src/edit/ui/editor-properties-dialog.h
+
+src/edit/ui/editor-window.h: data/editor/editor-window.ui
+       if [ ! -d src/edit/ui ]; then mkdir -p src/edit/ui; fi
+       uic-qt4 data/editor/editor-window.ui -o src/edit/ui/editor-window.h
+
+src/edit/ui/editor-properties-dialog.h: data/editor/editor-properties-dialog.ui
+       if [ ! -d src/edit/ui ]; then mkdir -p src/edit/ui; fi
+       uic-qt4 data/editor/editor-properties-dialog.ui -o src/edit/ui/editor-properties-dialog.h
 
-src/edit/editor.moc.cpp: src/edit/editor.h
+src/edit/editor.moc.cpp:  $(bin_logedit_HEADERS)
        moc-qt4 src/edit/editor.h -o src/edit/editor.moc.cpp
 #      $(MOC) src/edit/editor.h -o src/edit/editor.moc.cpp
+src/edit/my_edit.moc.cpp:  $(bin_logedit_HEADERS)
+       moc-qt4 src/edit/my_edit.h -o src/edit/my_edit.moc.cpp
 
 
 clean-logedit-extra:
+       rm -rf src/edit/ui
        rm -f src/edit/*.moc.cpp
        rm -f bin/modules/logedit
        rm -f bin/logedit