dlugolecki.net.pl
projects / vlp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update README
[vlp.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 13dddd85a78ec8c1e2a04fd64220527f99ea03f3..06fcee90d674d1df52c397b8c8c0ffa2b36b9460 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,16 @@ MOC = ${MOCDIR}/${MOCNAME}
 #AM_CXXFLAGS = -m32
 
 # @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_CPPFLAGS =
+AM_CXXFLAGS = \
+       -I$(top_srcdir)/src/global \
+       -I${QTDIR}/include/qt4 \
+       -pedantic \
+       -Wall \
+       -Wextra \
+       -DQT3_SUPPORT \
+       -DSYSCONFDIR='"$(sysconfdir)"' \
+       --std=c++11
 AM_LDFLAGS= -fPIC -L$(QTDIR)/lib -lQtCore -lQtGui -lQt3Support
 
 EXTRA_DIST = \
@@ -20,10 +29,10 @@ EXTRA_DIST = \
        doc/CodingStyle \
        doc/vlp.cfg.sample
 
-#   bin/loggraph   \
 #  bin/loghelp
 
 bin_PROGRAMS = \
+  bin/loggraph   \
   bin/lognet \
   bin/logker \
   bin/logint \
@@ -32,26 +41,36 @@ 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 \
-  src/lgconfig/lgconfig.moc \
-  src/preproc/prep.moc.cpp \
-  src/help/help.moc
+  src/lgconfig/lgconfig.moc.cpp
 
-bin_loggraph_SOURCES = src/graph/loggraph.cpp src/graph/loggraph.moc
+#  \
+#  src/help/help.moc
+
+bin_loggraph_SOURCES = \
+       $(bin_loggraph_HEADERS) \
+       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_loggraphdir = src/graph
+bin_loggraph_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
        rm -f bin/modules/loggraph
        rm -f bin/loggraph
 
-bin_lognet_SOURCES = src/net/lognet.cpp src/net/lognet.moc.cpp
+bin_lognet_SOURCES = \
+       $(bin_lognet_HEADERS) \
+       src/net/lognet.cpp \
+       src/net/lognet.moc.cpp
 bin_lognet_CPPFLAGS = $(bin_lognet_CFLAGS)
 bin_lognet_LDADD = $(bin_lognet_LIBS) -lconfig++
 bin_lognetdir = src/net
@@ -66,62 +85,78 @@ clean-lognet-extra:
        rm -f bin/lognet
        
 bin_logker_SOURCES = \
+       $(bin_logker_HEADERS) \
        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
+       src/kernel/ConnectDialog.cpp \
+       src/kernel/KillDialog.cpp \
+       src/kernel/LockDialog.cpp \
+       src/kernel/OptionsDialog.cpp \
+       src/kernel/OptionsDialog.moc.cpp \
+       src/kernel/MessageDialog.cpp \
+       src/global/vlp/config.cpp \
+       src/global/vlp/ConfigurationFinder.cpp \
+       src/global/vlp/QtConfigurationFinder.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/lock.h \
-       src/kernel/options.h \
-       src/kernel/kill_interpreter_dialog.h \
-       src/kernel/connect_dialog.h \
-       src/global/vlp/config.h
+       src/kernel/ConnectDialog.h \
+       src/kernel/KillDialog.h \
+       src/kernel/LockDialog.h \
+       src/kernel/OptionsDialog.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/global/vlp/ConfigurationFinder.h \
+       src/global/vlp/QtConfigurationFinder.h \
+       src/global/vlp/exception/ConfigFileNotFound.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
+               src/kernel/ui/KernelWindow.h \
+               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/MessageDialog.h
+       $(MOC) src/kernel/kernel.h -o src/kernel/kernel.moc.cpp
+       $(MOC) src/kernel/OptionsDialog.h -o src/kernel/OptionsDialog.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/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/dialogs/LockDialog.h:
+       uic src/kernel/ui/dialogs/LockDialog.ui -o src/kernel/ui/dialogs/LockDialog.h
 
-src/kernel/ui/optionsdialog.h:
-       uic src/kernel/ui/optionsdialog.ui -o src/kernel/ui/optionsdialog.h
+src/kernel/ui/dialogs/OptionsDialog.h:
+       uic src/kernel/ui/dialogs/OptionsDialog.ui -o src/kernel/ui/dialogs/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/dialogs/KillDialog.h:
+       uic src/kernel/ui/dialogs/KillDialog.ui -o src/kernel/ui/dialogs/KillDialog.h
 
-src/kernel/ui/connect_dialog.h:
-       uic src/kernel/ui/connect_dialog.ui -o src/kernel/ui/connect_dialog.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
        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 src/kernel/ui/dialogs/*.h
+       rm -f src/kernel/ui/*.h
        rm -f bin/logker
        
 bin_logint_SOURCES = \
+  $(bin_logint_HEADERS) \
   src/int/cint.c \
   src/int/compact.c \
   src/int/control.c \
@@ -164,28 +199,36 @@ clean-logint-extra:
        rm -f bin/logint
 
 bin_logedit_SOURCES = \
+       $(bin_logedit_HEADERS) \
        src/edit/editor.cpp \
        src/edit/editor.moc.cpp \
        src/edit/ProgramStructureDialog.cpp \
-       src/edit/UnitStructureDialog.cpp
+       src/edit/UnitStructureDialog.cpp \
+       src/edit/PreferencesDialog.cpp \
+       src/edit/FindDialog.cpp
 bin_logedit_CPPFLAGS = $(bin_logedit_CFLAGS)
 bin_logedit_LDADD = $(bin_logedit_LIBS)
 bin_logeditdir = src/edit
-bin_logedit_HEADERS =\
+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/ui/dialogs/UnitStructureDialog.h \
+       src/edit/PreferencesDialog.h \
+       src/edit/ui/dialogs/PreferencesDialog.h \
+       src/edit/FindDialog.h \
+       src/edit/ui/dialogs/FindDialog.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
-       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/dialogs/UnitStructureDialog.h \
+               src/edit/ui/dialogs/PreferencesDialog.h \
+               src/edit/ui/dialogs/FindDialog.h
+       $(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
@@ -196,6 +239,12 @@ 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
+
+src/edit/ui/dialogs/FindDialog.h:
+       uic src/edit/ui/dialogs/FindDialog.ui -o src/edit/ui/dialogs/FindDialog.h
+
 
 clean-logedit-extra:
        rm -f src/edit/ui/dialogs/*.h
@@ -204,19 +253,69 @@ clean-logedit-extra:
        rm -f bin/modules/logedit
        rm -f bin/logedit
 
-bin_lgconfig_SOURCES = src/lgconfig/lgconfig.cpp src/lgconfig/lgconfig.moc
+bin_lgconfig_SOURCES = \
+       $(bin_lgconfig_HEADERS) \
+       src/lgconfig/lgconfig.cpp \
+       src/lgconfig/lgconfig.moc.cpp \
+       src/lgconfig/AddNodeDialog.cpp \
+       src/lgconfig/AddNodeDialog.moc.cpp \
+       src/lgconfig/NodeListDialog.cpp \
+       src/lgconfig/NodeListDialog.moc.cpp \
+       src/global/vlp/config.cpp
 bin_lgconfig_CPPFLAGS = $(bin_lgconfig_CFLAGS)
 bin_lgconfig_LDADD = $(bin_lgconfig_LIBS) -lconfig++
-src/lgconfig/lgconfig.moc:
-       $(MOC) -i src/lgconfig/lgconfig.cpp -o src/lgconfig/lgconfig.moc
+bin_lgconfigdir = src/lgconfig
+bin_lgconfig_HEADERS = \
+       src/lgconfig/lgconfig.h \
+       src/lgconfig/NodeListDialog.h \
+       src/lgconfig/AddNodeDialog.h \
+       src/lgconfig/ui/VLPConfigWindow.h \
+       src/lgconfig/ui/dialogs/AddNodeDialog.h \
+       src/lgconfig/ui/dialogs/NodeListDialog.h \
+       src/global/vlp/config.h
+
+src/lgconfig/lgconfig.moc.cpp: \
+               src/lgconfig/ui/VLPConfigWindow.h \
+               src/lgconfig/ui/dialogs/AddNodeDialog.h \
+               src/lgconfig/ui/dialogs/NodeListDialog.h
+       $(MOC) src/lgconfig/lgconfig.h -o src/lgconfig/lgconfig.moc.cpp
+
+src/lgconfig/AddNodeDialog.moc.cpp: \
+               src/lgconfig/ui/dialogs/AddNodeDialog.h
+       $(MOC) src/lgconfig/AddNodeDialog.h -o src/lgconfig/AddNodeDialog.moc.cpp
+
+src/lgconfig/NodeListDialog.moc.cpp: \
+               src/lgconfig/ui/dialogs/NodeListDialog.h
+       $(MOC) src/lgconfig/NodeListDialog.h -o src/lgconfig/NodeListDialog.moc.cpp
+
+src/lgconfig/ui/VLPConfigWindow.h:
+       uic src/lgconfig/ui/VLPConfigWindow.ui -o src/lgconfig/ui/VLPConfigWindow.h
+
+src/lgconfig/ui/dialogs/AddNodeDialog.h:
+       uic src/lgconfig/ui/dialogs/AddNodeDialog.ui -o src/lgconfig/ui/dialogs/AddNodeDialog.h
+
+src/lgconfig/ui/dialogs/NodeListDialog.h:
+       uic src/lgconfig/ui/dialogs/NodeListDialog.ui -o src/lgconfig/ui/dialogs/NodeListDialog.h
 
 clean-lgconfig-extra:
-       rm -f src/lgconfig/*.moc
+       rm -f src/lgconfig/*.moc.cpp
+       rm -f src/lgconfig/ui/*.h
+       rm -f src/lgconfig/ui/dialogs/*.h
        rm -f bin/lgconfig
 
-bin_logcomp_SOURCES = src/preproc/prep.cpp src/preproc/prep.moc.cpp
+bin_logcomp_SOURCES = \
+       src/preproc/prep.cpp \
+       src/preproc/prep.moc.cpp \
+       src/global/vlp/ConfigurationFinder.cpp \
+       src/global/vlp/QtConfigurationFinder.cpp
 bin_logcomp_CPPFLAGS = $(bin_logcomp_CFLAGS)
 bin_logcomp_LDADD = $(bin_logcomp_LIBS)
+bin_lgconfigdir = src/preproc
+bin_lgconfig_HEADERS = \
+       src/global/vlp/ConfigurationFinder.h \
+       src/global/vlp/QtConfigurationFinder.h \
+       src/global/vlp/exception/ConfigFileNotFound.h
+
 src/preproc/prep.moc.cpp: src/preproc/prep.cpp 
        $(MOC) src/preproc/prep.cpp -o src/preproc/prep.moc.cpp
 
@@ -224,9 +323,12 @@ clean-logcomp-extra:
        rm -f src/preproc/*.moc
        rm -f bin/logcomp
 
-bin_loghelp_SOURCES = src/help/help.cpp src/help/help.moc
+bin_loghelp_SOURCES = \
+       src/help/help.cpp \
+       src/help/help.moc
 bin_loghelp_CPPFLAGS = $(bin_loghelp_CFLAGS)
 bin_loghelp_LDADD = $(bin_loghelp_LIBS)
+
 src/help/help.moc:
        $(MOC) -i src/help/help.cpp -o src/help/help.moc
 
@@ -265,7 +367,8 @@ clean-am: \
   clean-logedit-extra \
   clean-lgconfig-extra \
   clean-logcomp-extra \
-  clean-loghelp-extra
+  clean-loghelp-extra \
+  clean-doxygen-extra
        rm -rf bin/doc
        rm -rf bin/pics
        rm -rf bin/modules
@@ -273,6 +376,7 @@ clean-am: \
        rm -rf bin/compile
        rm -rf bin/examp
        rm -f bin/vlp.cfg
+       find ./ -name *.o -exec rm {} \;
 
 CLEANFILES = \
        %.o \
@@ -296,8 +400,18 @@ doxyfile.stamp:
 
 #all-local: doxyfile.stamp
 
-clean-local:
+clean-doxygen-extra:
+       rm  -f $(top_srcdir)/doxyfile.stamp
+       rm  -f $(top_srcdir)/Doxyfile
+       rm  -f $(top_srcdir)/doc/doxygen_sqlite3.db
+       rm -rf $(top_srcdir)/doc/doxygen
        rm -rf $(top_srcdir)/doc/man
+       rm -rf $(top_srcdir)/doc/html
+       rm -rf $(top_srcdir)/doc/latex
+
+else
+
+clean-doxygen-extra:
 
 endif
 
VLP - Virtual Loglan Processor