Reduce scope of some variables
[vlp.git] / Makefile.am
index ea6c776e98bf4cbc003b7d37ff7057e07dd23a82..f9367881f1da70f7932966299be4bab3afe5b6f3 100644 (file)
@@ -5,24 +5,36 @@ MOC = ${MOCDIR}/${MOCNAME}
 
 #AM_CXXFLAGS= -Wall -pedantic -Wextra -fno-strength-reduce
 #AM_CXXFLAGS = -m32
-AM_CXXFLAGS = -I$(top_srcdir)/src/global
-AM_LDFLAGS= -fPIC
 
+# @TODO: move --std=c++11 to the autoconf
+AM_CXXFLAGS = -I$(top_srcdir)/src/global -I${QTDIR}/include/qt4 -pedantic -Wall -Wextra -DQT3_SUPPORT --std=c++11
+AM_LDFLAGS= -fPIC -L$(QTDIR)/lib -lQtCore -lQtGui -lQt3Support
+
+EXTRA_DIST = \
+       doc/examples \
+       doc/install \
+       doc/html-old  \
+       doc/installQT.html \
+       doc/InstallVLP.html \
+       doc/INSTALL_VLP.pdf \
+       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 \
@@ -41,7 +53,10 @@ 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
 src/net/lognet.moc.cpp:
        $(MOC) -i src/net/lognet.cpp -o src/net/lognet.moc.cpp
 
@@ -50,14 +65,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) -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 = \
@@ -83,27 +144,76 @@ 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 \
+       src/int/int.h \
+       src/int/intproto.h \
+       src/int/nonstand.h \
+       src/int/process.h \
+       src/int/queue.h \
+       src/int/depend.h \
+       src/int/eventque.h \
+       src/global/comm.h \
+       src/global/genint1.h \
+       src/global/socu.h
 
 clean-logint-extra:
        rm -f bin/logint
 
-bin_logedit_SOURCES = src/edit/editor.cpp src/edit/editor.moc.cpp 
-bin_logedit_CPPFLAGS = $(bin_logedit_CFLAGS) 
+bin_logedit_SOURCES = \
+       src/edit/editor.cpp \
+       src/edit/editor.moc.cpp \
+       src/edit/ProgramStructureDialog.cpp \
+       src/edit/UnitStructureDialog.cpp \
+       src/edit/PreferencesDialog.cpp
+bin_logedit_CPPFLAGS = $(bin_logedit_CFLAGS)
 bin_logedit_LDADD = $(bin_logedit_LIBS)
-
-src/edit/editor.moc.cpp: src/edit/editor.h
-       $(MOC) src/edit/editor.h -o src/edit/editor.moc.cpp
+bin_logeditdir = src/edit
+bin_logedit_HEADERS =\
+       src/edit/editor.h \
+       src/edit/ui/editor.h \
+       src/edit/ProgramStructureDialog.h \
+       src/edit/ui/dialogs/ProgramStructureDialog.h \
+       src/edit/UnitStructureDialog.h \
+       src/edit/ui/dialogs/UnitStructureDialog.h \
+       src/edit/PreferencesDialog.h \
+       src/edit/ui/dialogs/PreferencesDialog.h
+
+src/edit/editor.moc.cpp: \
+               src/edit/editor.h \
+               src/edit/ui/editor.h \
+               src/edit/ui/dialogs/ProgramStructureDialog.h \
+               src/edit/ui/dialogs/UnitStructureDialog.h \
+               src/edit/ui/dialogs/PreferencesDialog.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
+
+src/edit/ui/dialogs/ProgramStructureDialog.h:
+       uic src/edit/ui/dialogs/ProgramStructureDialog.ui -o src/edit/ui/dialogs/ProgramStructureDialog.h
+
+src/edit/ui/dialogs/UnitStructureDialog.h:
+       uic src/edit/ui/dialogs/UnitStructureDialog.ui -o src/edit/ui/dialogs/UnitStructureDialog.h
+
+src/edit/ui/dialogs/PreferencesDialog.h:
+       uic src/edit/ui/dialogs/PreferencesDialog.ui -o src/edit/ui/dialogs/PreferencesDialog.h
 
 
 clean-logedit-extra:
+       rm -f src/edit/ui/dialogs/*.h
+       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
 
@@ -133,12 +243,26 @@ clean-loghelp-extra:
        rm -f bin/loghelp
 
 all-local: doxyfile.stamp
+       test -d bin/doc || mkdir bin/doc
+       test -d bin/pics || mkdir bin/pics
        test -d bin/modules || mkdir bin/modules
+       test -d bin/config || mkdir bin/config
+       test -d bin/compile || mkdir bin/compile
+       test -d bin/doc/lang || mkdir bin/doc/lang
+       test -d bin/examp || mkdir bin/examp
        ln -fs ../logedit bin/modules/
        ln -fs ../loggraph bin/modules/
        ln -fs ../loghelp bin/modules/
        ln -fs ../lognet bin/modules/
+       ln -fs ../logint bin/modules/
+       ln -fs ../logcomp bin/compile/
+       ln -fs ../lgconfig bin/config/
+       ln -fs ../../doc/install/inst/loglan bin/compile/
+       ln -fs ../../doc/install/inst/gen bin/compile/
        cp doc/vlp.cfg.sample bin/vlp.cfg
+       cp -r doc/examples/* bin/examp/
+       cp doc/install/inst/close.bmp bin/pics/
+       cp doc/install/inst/logo.bmp bin/config/
 
 clean-am: \
   clean-loggraph-extra \
@@ -149,7 +273,12 @@ clean-am: \
   clean-lgconfig-extra \
   clean-logcomp-extra \
   clean-loghelp-extra
+       rm -rf bin/doc
+       rm -rf bin/pics
        rm -rf bin/modules
+       rm -rf bin/config
+       rm -rf bin/compile
+       rm -rf bin/examp
        rm -f bin/vlp.cfg
 
 CLEANFILES = \
@@ -160,11 +289,13 @@ CLEANFILES = \
 
 if HAVE_DOXYGEN
 
-directory = $(top_srcdir)/doc/man/man3/
+directory = $(top_srcdir)/doc/man/man3
 
-dist_man_MANS = $(directory)/man_page_1.3 $(directory)/man_page_2.3
-$(directory)/man_page_1.3: doxyfile.stamp
-$(directory)/man_page_2.3: doxyfile.stamp
+#dist_man_MANS = \
+#      $(directory)/Editor.3 \
+#      $(directory)/QKernel.3
+#$(directory)/man_page_1.3: doxyfile.stamp
+#$(directory)/man_page_2.3: doxyfile.stamp
 
 doxyfile.stamp:
        $(DOXYGEN) Doxyfile