X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=Makefile.am;h=d94f59663ce410c7be7fa4306c5d5d07f5f17fa3;hb=c53612650313e842a9de1d3e8dbbcd6e23d7d7d8;hp=b346c8786d9386c15b4f6b2c87f8324b4c4fba4b;hpb=289f5009e70ceb4a6c7978c13d92155bd6027053;p=vlp.git diff --git a/Makefile.am b/Makefile.am index b346c87..d94f596 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,43 +5,77 @@ 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_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 = \ + doc/examples \ + doc/install \ + doc/html-old \ + doc/installQT.html \ + doc/InstallVLP.html \ + doc/INSTALL_VLP.pdf \ + doc/CodingStyle \ + doc/vlp.cfg.sample + +# bin/loghelp bin_PROGRAMS = \ - bin/loggraph \ + 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/graph/loggraph.moc.cpp \ 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 \ - 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) +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,17 +84,79 @@ 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 = \ + $(bin_logker_HEADERS) \ + 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/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) -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/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/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/dialogs/LockDialog.h: + uic src/kernel/ui/dialogs/LockDialog.ui -o src/kernel/ui/dialogs/LockDialog.h + +src/kernel/ui/dialogs/OptionsDialog.h: + uic src/kernel/ui/dialogs/OptionsDialog.ui -o src/kernel/ui/dialogs/OptionsDialog.h + +src/kernel/ui/dialogs/KillDialog.h: + uic src/kernel/ui/dialogs/KillDialog.ui -o 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 + rm -f src/kernel/*.moc.cpp + 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 \ @@ -83,37 +179,143 @@ 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 = \ + $(bin_logedit_HEADERS) \ + src/edit/editor.cpp \ + src/edit/editor.moc.cpp \ + src/edit/ProgramStructureDialog.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 = \ + 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/FindDialog.h \ + src/edit/ui/dialogs/FindDialog.h -src/edit/editor.moc.cpp: src/edit/editor.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 \ + 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 + +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 + +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 + 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_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) -src/lgconfig/lgconfig.moc: - $(MOC) -i src/lgconfig/lgconfig.cpp -o src/lgconfig/lgconfig.moc +bin_lgconfig_LDADD = $(bin_lgconfig_LIBS) -lconfig++ +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 @@ -121,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 @@ -147,13 +352,13 @@ all-local: doxyfile.stamp 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/ -# cp inst/loglan $(INSTALLDIR)/compile -# cp inst/gen $(INSTALLDIR)/compile clean-am: \ clean-loggraph-extra \ clean-lognet-extra \ @@ -170,6 +375,7 @@ clean-am: \ rm -rf bin/compile rm -rf bin/examp rm -f bin/vlp.cfg + find ./ -name *.o -exec rm {} \; CLEANFILES = \ %.o \ @@ -177,4 +383,25 @@ CLEANFILES = \ %~ \ doxyfile.stamp +if HAVE_DOXYGEN + +directory = $(top_srcdir)/doc/man/man3 + +#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 + echo Timestamp > doxyfile.stamp + +#all-local: doxyfile.stamp + +clean-local: + rm -rf $(top_srcdir)/doc/man + +endif + dist_noinst_SCRIPTS = autogen.sh