Replace and remove old methods with newly named ones integrated with layout generated...

[vlp.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 02664503bb87784af6d9a9d7a71af9b53cec9c74..0ffe5b544fb6b71346bd9d681e15d07bc134984c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,8 +5,8 @@ MOC = ${MOCDIR}/${MOCNAME}
 
 #AM_CXXFLAGS= -Wall -pedantic -Wextra -fno-strength-reduce
 #AM_CXXFLAGS = -m32
-AM_CXXFLAGS = -I$(top_srcdir)/src/global
-AM_LDFLAGS= -fPIC
+AM_CXXFLAGS = -I$(top_srcdir)/src/global -I${QTDIR}/include/qt4 -pedantic -Wall -Wextra -DQT3_SUPPORT 
+AM_LDFLAGS= -fPIC -L$(QTDIR)/lib -lQtCore -lQtGui -lQt3Support
 
 EXTRA_DIST = \
        doc/examples \
@@ -18,20 +18,21 @@ EXTRA_DIST = \
        doc/CodingStyle \
        doc/vlp.cfg.sample
 
+#   bin/loggraph   \
+#  bin/loghelp
+
 bin_PROGRAMS = \
-  bin/loggraph \
   bin/lognet \
   bin/logker \
   bin/logint \
   bin/logedit \
   bin/lgconfig \
-  bin/logcomp \
-  bin/loghelp
+  bin/logcomp
 
 BUILT_SOURCES = \
   src/graph/loggraph.moc \
   src/net/lognet.moc.cpp \
-  src/kernel/kernel.moc \
+  src/kernel/kernel.moc.cpp \
   src/edit/editor.moc.cpp \
   src/lgconfig/lgconfig.moc \
   src/preproc/prep.moc.cpp \
@@ -50,7 +51,7 @@ clean-loggraph-extra:
 
 bin_lognet_SOURCES = src/net/lognet.cpp src/net/lognet.moc.cpp
 bin_lognet_CPPFLAGS = $(bin_lognet_CFLAGS)
-bin_lognet_LDADD = $(bin_lognet_LIBS)
+bin_lognet_LDADD = $(bin_lognet_LIBS) -lconfig++
 bin_lognetdir = src/net
 bin_lognet_HEADERS = \
        src/net/soct.h
@@ -62,15 +63,60 @@ clean-lognet-extra:
        rm -f bin/modules/lognet
        rm -f bin/lognet
        
-bin_logker_SOURCES = src/kernel/kernel.cpp src/kernel/kernel.moc
+bin_logker_SOURCES = \
+       src/kernel/kernel.cpp \
+       src/kernel/kernel.moc.cpp \
+       src/kernel/lock.cpp \
+       src/kernel/options.cpp \
+       src/kernel/options.moc.cpp \
+       src/kernel/kill_interpreter_dialog.cpp \
+       src/kernel/connect_dialog.cpp \
+       src/global/vlp/config.cpp
 bin_logker_CPPFLAGS = $(bin_logker_CFLAGS)
-bin_logker_LDADD = $(bin_logker_LIBS)
-src/kernel/kernel.moc:
-       moc-qt4 -i src/kernel/kernel.cpp -o src/kernel/kernel.moc
+bin_logker_LDADD = $(bin_logker_LIBS) -lconfig++ -lX11
+bin_logkerdir = src/kernel
+bin_logker_HEADERS = \
+       src/kernel/kernel.h \
+       src/kernel/lock.h \
+       src/kernel/options.h \
+       src/kernel/kill_interpreter_dialog.h \
+       src/kernel/connect_dialog.h \
+       src/global/vlp/config.h
+src/kernel/kernel.moc.cpp: \
+               src/kernel/kernel.h \
+               src/kernel/ui/kernelwindow.h \
+               src/kernel/ui/lock_dialog.h \
+               src/kernel/ui/optionsdialog.h \
+               src/kernel/ui/kill_dialog.h \
+               src/kernel/ui/connect_dialog.h
+       moc-qt4 src/kernel/kernel.h -o src/kernel/kernel.moc.cpp
+       moc-qt4 src/kernel/options.h -o src/kernel/options.moc.cpp
 #      $(MOC) -i src/kernel/kernel.cpp -o src/kernel/kernel.moc
-       
+
+src/kernel/ui/kernelwindow.h:
+       uic src/kernel/ui/kernelwindow.ui -o src/kernel/ui/kernelwindow.h
+
+src/kernel/ui/lock_dialog.h:
+       uic src/kernel/ui/lock_dialog.ui -o src/kernel/ui/lock_dialog.h
+
+src/kernel/ui/optionsdialog.h:
+       uic src/kernel/ui/optionsdialog.ui -o src/kernel/ui/optionsdialog.h
+
+src/kernel/ui/kill_dialog.h:
+       uic src/kernel/ui/kill_dialog.ui -o src/kernel/ui/kill_dialog.h
+
+src/kernel/ui/connect_dialog.h:
+       uic src/kernel/ui/connect_dialog.ui -o src/kernel/ui/connect_dialog.h
+
+
 clean-logker-extra:
        rm -f src/kernel/*.moc
+       rm -f src/kernel/*.moc.cpp
+       rm -f src/kernel/ui/kernelwindow.h
+       rm -f src/kernel/ui/lock_dialog.h
+       rm -f src/kernel/ui/optionsdialog.h
+       rm -f src/kernel/ui/kill_dialog.h
+       rm -f src/kernel/ui/connect_dialog.h
        rm -f bin/logker
        
 bin_logint_SOURCES = \
@@ -96,7 +142,8 @@ bin_logint_SOURCES = \
 # TODO: logint is compiled using gcc instead of g++, for some reason it losts -I./src/global directive
 #       force adding it.
 bin_logint_CPPFLAGS = $(bin_logint_CFLAGS) -DUNIX -DWORD_32BIT -DUSE_CLOCK -Dpascal= -DOBJECTADDR -DSYSV -I$(top_srcdir)/src/global -I/usr/include/qt3
-bin_logint_LDADD = $(bin_logint_LIBS) -lm -lqt-mt
+bin_logint_LDADD = $(bin_logint_LIBS) -lm
+# -lqt-mt
 bin_logintdir = src/int
 bin_logint_HEADERS = \
        src/int/genint.h \
@@ -119,21 +166,28 @@ 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/ui/editor.h
 
-src/edit/editor.moc.cpp: src/edit/editor.h
+src/edit/editor.moc.cpp: \
+               src/edit/editor.h \
+               src/edit/ui/editor.h
        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/ui/editor.h:
+       uic src/edit/ui/editor.ui -o src/edit/ui/editor.h
+
 
 clean-logedit-extra:
+       rm -f src/edit/ui/editor.h
        rm -f src/edit/*.moc.cpp
        rm -f bin/modules/logedit
        rm -f bin/logedit
 
 bin_lgconfig_SOURCES = src/lgconfig/lgconfig.cpp src/lgconfig/lgconfig.moc
 bin_lgconfig_CPPFLAGS = $(bin_lgconfig_CFLAGS)
-bin_lgconfig_LDADD = $(bin_lgconfig_LIBS)
+bin_lgconfig_LDADD = $(bin_lgconfig_LIBS) -lconfig++
 src/lgconfig/lgconfig.moc:
        $(MOC) -i src/lgconfig/lgconfig.cpp -o src/lgconfig/lgconfig.moc