From: Rafał Długołęcki Date: Fri, 5 Jul 2013 21:21:22 +0000 (+0200) Subject: Changed directory structure. X-Git-Tag: 3.1~74 X-Git-Url: https://git.dlugolecki.net.pl/?a=commitdiff_plain;h=7a277153cc72eed9f152af09f22e680db3ec6563;p=vlp.git Changed directory structure. --- diff --git a/Makefile.am b/Makefile.am index 60646f6..cd1268d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,97 +9,97 @@ AM_LDFLAGS= -fPIC bin_PROGRAMS = \ - graph/loggraph \ - net/lognet \ - kernel/logker \ - int/logint \ - edit/logedit \ - lgconfig/lgconfig \ - preproc/logcomp \ - help/loghelp + bin/loggraph \ + bin/lognet \ + bin/logker \ + bin/logint \ + bin/logedit \ + bin/lgconfig \ + bin/logcomp \ + bin/loghelp BUILT_SOURCES = \ - graph/loggraph.moc \ - net/lognet.moc \ - kernel/kernel.moc \ - edit/editor.moc \ - lgconfig/lgconfig.moc \ - preproc/prep.moc \ - help/help.moc + src/graph/loggraph.moc \ + src/net/lognet.moc \ + src/kernel/kernel.moc \ + src/edit/editor.moc \ + src/lgconfig/lgconfig.moc \ + src/preproc/prep.moc \ + src/help/help.moc # int/logint.moc -graph_loggraph_SOURCES = graph/loggraph.cpp -graph_loggraph_CPPFLAGS = $(graph_loggraph_CFLAGS) -graph_loggraph_LDADD = $(graph_loggraph_LIBS) -$(graph_loggraph_OBJECTS) : graph/loggraph.moc -graph/loggraph.moc: - $(MOC) -i graph/loggraph.cpp -o graph/loggraph.moc +bin_loggraph_SOURCES = src/graph/loggraph.cpp +bin_loggraph_CPPFLAGS = $(bin_loggraph_CFLAGS) +bin_loggraph_LDADD = $(bin_loggraph_LIBS) +$(bin_loggraph_OBJECTS) : src/graph/loggraph.moc +src/graph/loggraph.moc: + $(MOC) -i src/graph/loggraph.cpp -o src/graph/loggraph.moc clean-loggraph-extra: - rm graph/*.moc + rm src/graph/*.moc -net_lognet_SOURCES = net/lognet.cpp -net_lognet_CPPFLAGS = $(net_lognet_CFLAGS) -net_lognet_LDADD = $(net_lognet_LIBS) -$(net_lognet_OBJECTS) : net/lognet.moc -net/lognet.moc: - $(MOC) -i net/lognet.cpp -o net/lognet.moc +bin_lognet_SOURCES = src/net/lognet.cpp +bin_lognet_CPPFLAGS = $(bin_lognet_CFLAGS) +bin_lognet_LDADD = $(bin_lognet_LIBS) +$(bin_lognet_OBJECTS) : src/net/lognet.moc +src/net/lognet.moc: + $(MOC) -i src/net/lognet.cpp -o src/net/lognet.moc clean-lognet-extra: - rm net/*.moc + rm src/net/*.moc -kernel_logker_SOURCES = kernel/kernel.cpp -kernel_logker_CPPFLAGS = $(kernel_logker_CFLAGS) -kernel_logker_LDADD = $(kernel_logker_LIBS) -$(kernel_logker_OBJECTS) : kernel/kernel.moc -kernel/kernel.moc: - $(MOC) -i kernel/kernel.cpp -o kernel/kernel.moc +bin_logker_SOURCES = src/kernel/kernel.cpp +bin_logker_CPPFLAGS = $(bin_logker_CFLAGS) +bin_logker_LDADD = $(bin_logker_LIBS) +$(bin_logker_OBJECTS) : src/kernel/kernel.moc +src/kernel/kernel.moc: + $(MOC) -i src/kernel/kernel.cpp -o src/kernel/kernel.moc clean-logker-extra: - rm kernel/*.moc + rm src/kernel/*.moc #int_logint_SOURCES = kernel/kernel.moc -edit_logedit_SOURCES = edit/editor.moc -edit_logedit_CPPFLAGS = $(edit_logedit_CFLAGS) -edit_logedit_LDADD = $(edit_logedit_LIBS) -$(edit_logedit_OBJECTS) : edit/editor.moc -edit/editor.moc: - $(MOC) -i edit/editor.cpp -o edit/editor.moc +bin_logedit_SOURCES = src/edit/editor.moc +bin_logedit_CPPFLAGS = $(bin_logedit_CFLAGS) +bin_logedit_LDADD = $(bin_logedit_LIBS) +$(bin_logedit_OBJECTS) : src/edit/editor.moc +src/edit/editor.moc: + $(MOC) -i src/edit/editor.cpp -o src/edit/editor.moc clean-logedit-extra: - rm edit/*.moc + rm src/edit/*.moc -lgconfig_lgconfig_SOURCES = lgconfig/lgconfig.moc -lgconfig_lgconfig_CPPFLAGS = $(lgconfig_lgconfig_CFLAGS) -lgconfig_lgconfig_LDADD = $(lgconfig_lgconfig_LIBS) -$(lgconfig_lgconfig_OBJECTS) : lgconfig/lgconfig.moc -lgconfig/lgconfig.moc: - $(MOC) -i lgconfig/lgconfig.cpp -o lgconfig/lgconfig.moc +bin_lgconfig_SOURCES = src/lgconfig/lgconfig.moc +bin_lgconfig_CPPFLAGS = $(bin_lgconfig_CFLAGS) +bin_lgconfig_LDADD = $(bin_lgconfig_LIBS) +$(bin_lgconfig_OBJECTS) : src/lgconfig/lgconfig.moc +src/lgconfig/lgconfig.moc: + $(MOC) -i src/lgconfig/lgconfig.cpp -o src/lgconfig/lgconfig.moc clean-lgconfig-extra: - rm lgconfig/*.moc + rm src/lgconfig/*.moc -preproc_logcomp_SOURCES = preproc/prep.moc -preproc_logcomp_CPPFLAGS = $(preproc_logcomp_CFLAGS) -preproc_logcomp_LDADD = $(preproc_logcomp_LIBS) -$(preproc_logcomp_OBJECTS) : preproc/prep.moc -preproc/prep.moc: - $(MOC) -i preproc/prep.cpp -o preproc/prep.moc +bin_logcomp_SOURCES = src/preproc/prep.moc +bin_logcomp_CPPFLAGS = $(preproc_logcomp_CFLAGS) +bin_logcomp_LDADD = $(preproc_logcomp_LIBS) +$(bin_logcomp_OBJECTS) : src/preproc/prep.moc +src/preproc/prep.moc: + $(MOC) -i src/preproc/prep.cpp -o src/preproc/prep.moc clean-logcomp-extra: - rm preproc/*.moc + rm src/preproc/*.moc -help_loghelp_SOURCES = help/help.moc -help_loghelp_CPPFLAGS = $(help_loghelp_CFLAGS) -help_loghelp_LDADD = $(help_loghelp_LIBS) -$(help_loghelp_OBJECTS) : help/help.moc -help/help.moc: - $(MOC) -i help/help.cpp -o help/help.moc +bin_loghelp_SOURCES = src/help/help.moc +bin_loghelp_CPPFLAGS = $(bin_loghelp_CFLAGS) +bin_loghelp_LDADD = $(bin_loghelp_LIBS) +$(bin_loghelp_OBJECTS) : src/help/help.moc +src/help/help.moc: + $(MOC) -i src/help/help.cpp -o src/help/help.moc clean-loghelp-extra: - rm help/*.moc + rm src/help/*.moc CLEANFILES = \ %.moc \ diff --git a/configure.ac b/configure.ac index 8f3f70b..733381f 100644 --- a/configure.ac +++ b/configure.ac @@ -11,14 +11,14 @@ AC_CONFIG_FILES([Makefile]) # libqt3-mt:i386 # libqt3-mt-dev:i386 # qt3-dev-tools:i386 -PKG_CHECK_MODULES([graph_loggraph], [qt-mt < 4.0]) -PKG_CHECK_MODULES([net_lognet], [qt-mt < 4.0]) -PKG_CHECK_MODULES([kernel_logker], [qt-mt < 4.0]) +PKG_CHECK_MODULES([bin_loggraph], [qt-mt < 4.0]) +PKG_CHECK_MODULES([bin_lognet], [qt-mt < 4.0]) +PKG_CHECK_MODULES([bin_logker], [qt-mt < 4.0]) #PKG_CHECK_MODULES([int_logint], [qt-mt < 4.0]) -PKG_CHECK_MODULES([edit_logedit], [qt-mt < 4.0]) -PKG_CHECK_MODULES([lgconfig_lgconfig], [qt-mt < 4.0]) -PKG_CHECK_MODULES([preproc_logcomp], [qt-mt < 4.0]) -PKG_CHECK_MODULES([help_loghelp], [qt-mt < 4.0]) +PKG_CHECK_MODULES([bin_logedit], [qt-mt < 4.0]) +PKG_CHECK_MODULES([bin_lgconfig], [qt-mt < 4.0]) +PKG_CHECK_MODULES([bin_logcomp], [qt-mt < 4.0]) +PKG_CHECK_MODULES([bin_loghelp], [qt-mt < 4.0]) # Get Qt3 library and include locations AC_ARG_WITH([moc-compiler-name], diff --git a/INSTALL_VLP.pdf b/doc/INSTALL_VLP.pdf similarity index 100% rename from INSTALL_VLP.pdf rename to doc/INSTALL_VLP.pdf diff --git a/InstallVLP.html b/doc/InstallVLP.html similarity index 100% rename from InstallVLP.html rename to doc/InstallVLP.html diff --git a/examp/BinA.log b/doc/examples/BinA.log similarity index 100% rename from examp/BinA.log rename to doc/examples/BinA.log diff --git a/examp/ale.log b/doc/examples/ale.log similarity index 100% rename from examp/ale.log rename to doc/examples/ale.log diff --git a/examp/anon.log b/doc/examples/anon.log similarity index 100% rename from examp/anon.log rename to doc/examples/anon.log diff --git a/examp/ansitest.log b/doc/examples/ansitest.log similarity index 100% rename from examp/ansitest.log rename to doc/examples/ansitest.log diff --git a/examp/arrnon.log b/doc/examples/arrnon.log similarity index 100% rename from examp/arrnon.log rename to doc/examples/arrnon.log diff --git a/examp/asyg.log b/doc/examples/asyg.log similarity index 100% rename from examp/asyg.log rename to doc/examples/asyg.log diff --git a/examp/azero.log b/doc/examples/azero.log similarity index 100% rename from examp/azero.log rename to doc/examples/azero.log diff --git a/examp/classes/ansi.inc b/doc/examples/classes/ansi.inc similarity index 100% rename from examp/classes/ansi.inc rename to doc/examples/classes/ansi.inc diff --git a/examp/classes/gui.inc b/doc/examples/classes/gui.inc similarity index 100% rename from examp/classes/gui.inc rename to doc/examples/classes/gui.inc diff --git a/examp/classes/machine.inc b/doc/examples/classes/machine.inc similarity index 100% rename from examp/classes/machine.inc rename to doc/examples/classes/machine.inc diff --git a/examp/drugi.log b/doc/examples/drugi.log similarity index 100% rename from examp/drugi.log rename to doc/examples/drugi.log diff --git a/examp/first.log b/doc/examples/first.log similarity index 100% rename from examp/first.log rename to doc/examples/first.log diff --git a/examp/five.log b/doc/examples/five.log similarity index 100% rename from examp/five.log rename to doc/examples/five.log diff --git a/examp/geometria.log b/doc/examples/geometria.log similarity index 100% rename from examp/geometria.log rename to doc/examples/geometria.log diff --git a/examp/graf.dta b/doc/examples/graf.dta similarity index 100% rename from examp/graf.dta rename to doc/examples/graf.dta diff --git a/examp/graf.txt b/doc/examples/graf.txt similarity index 100% rename from examp/graf.txt rename to doc/examples/graf.txt diff --git a/examp/graf1.dta b/doc/examples/graf1.dta similarity index 100% rename from examp/graf1.dta rename to doc/examples/graf1.dta diff --git a/examp/graf2.dta b/doc/examples/graf2.dta similarity index 100% rename from examp/graf2.dta rename to doc/examples/graf2.dta diff --git a/examp/graf96.log b/doc/examples/graf96.log similarity index 100% rename from examp/graf96.log rename to doc/examples/graf96.log diff --git a/examp/guitest.log b/doc/examples/guitest.log similarity index 100% rename from examp/guitest.log rename to doc/examples/guitest.log diff --git a/examp/illdet.log b/doc/examples/illdet.log similarity index 100% rename from examp/illdet.log rename to doc/examples/illdet.log diff --git a/examp/illkill.log b/doc/examples/illkill.log similarity index 100% rename from examp/illkill.log rename to doc/examples/illkill.log diff --git a/examp/lift4.log b/doc/examples/lift4.log similarity index 100% rename from examp/lift4.log rename to doc/examples/lift4.log diff --git a/examp/lift5.log b/doc/examples/lift5.log similarity index 100% rename from examp/lift5.log rename to doc/examples/lift5.log diff --git a/examp/logo.bmp b/doc/examples/logo.bmp similarity index 100% rename from examp/logo.bmp rename to doc/examples/logo.bmp diff --git a/examp/mtest.log b/doc/examples/mtest.log similarity index 100% rename from examp/mtest.log rename to doc/examples/mtest.log diff --git a/examp/piszczyt.log b/doc/examples/piszczyt.log similarity index 100% rename from examp/piszczyt.log rename to doc/examples/piszczyt.log diff --git a/examp/reftonone.log b/doc/examples/reftonone.log similarity index 100% rename from examp/reftonone.log rename to doc/examples/reftonone.log diff --git a/examp/remote.log b/doc/examples/remote.log similarity index 100% rename from examp/remote.log rename to doc/examples/remote.log diff --git a/examp/rozdzPun1.log b/doc/examples/rozdzPun1.log similarity index 100% rename from examp/rozdzPun1.log rename to doc/examples/rozdzPun1.log diff --git a/examp/spooler.log b/doc/examples/spooler.log similarity index 100% rename from examp/spooler.log rename to doc/examples/spooler.log diff --git a/examp/taktto1.log b/doc/examples/taktto1.log similarity index 100% rename from examp/taktto1.log rename to doc/examples/taktto1.log diff --git a/examp/teststring.log b/doc/examples/teststring.log similarity index 100% rename from examp/teststring.log rename to doc/examples/teststring.log diff --git a/examp/trzeci.log b/doc/examples/trzeci.log similarity index 100% rename from examp/trzeci.log rename to doc/examples/trzeci.log diff --git a/doc/ansi.html b/doc/html/ansi.html similarity index 100% rename from doc/ansi.html rename to doc/html/ansi.html diff --git a/doc/gui.html b/doc/html/gui.html similarity index 100% rename from doc/gui.html rename to doc/html/gui.html diff --git a/doc/gui1.html b/doc/html/gui1.html similarity index 100% rename from doc/gui1.html rename to doc/html/gui1.html diff --git a/doc/gui2.html b/doc/html/gui2.html similarity index 100% rename from doc/gui2.html rename to doc/html/gui2.html diff --git a/doc/iiuwgraph.html b/doc/html/iiuwgraph.html similarity index 100% rename from doc/iiuwgraph.html rename to doc/html/iiuwgraph.html diff --git a/doc/index.html b/doc/html/index.html similarity index 100% rename from doc/index.html rename to doc/html/index.html diff --git a/doc/langg.html b/doc/html/langg.html similarity index 100% rename from doc/langg.html rename to doc/html/langg.html diff --git a/doc/machine.html b/doc/html/machine.html similarity index 100% rename from doc/machine.html rename to doc/html/machine.html diff --git a/doc/userg.html b/doc/html/userg.html similarity index 100% rename from doc/userg.html rename to doc/html/userg.html diff --git a/installQT.html b/doc/installQT.html similarity index 100% rename from installQT.html rename to doc/installQT.html diff --git a/edit/editor.cpp b/src/edit/editor.cpp similarity index 100% rename from edit/editor.cpp rename to src/edit/editor.cpp diff --git a/edit/editor.h b/src/edit/editor.h similarity index 100% rename from edit/editor.h rename to src/edit/editor.h diff --git a/edit/mfile b/src/edit/mfile similarity index 100% rename from edit/mfile rename to src/edit/mfile diff --git a/graph/loggraph.cpp b/src/graph/loggraph.cpp similarity index 100% rename from graph/loggraph.cpp rename to src/graph/loggraph.cpp diff --git a/graph/mfile b/src/graph/mfile similarity index 100% rename from graph/mfile rename to src/graph/mfile diff --git a/graph/socu.h b/src/graph/socu.h similarity index 100% rename from graph/socu.h rename to src/graph/socu.h diff --git a/head/comm.h b/src/head/comm.h similarity index 100% rename from head/comm.h rename to src/head/comm.h diff --git a/head/genint1.h b/src/head/genint1.h similarity index 100% rename from head/genint1.h rename to src/head/genint1.h diff --git a/help/help.cpp b/src/help/help.cpp similarity index 100% rename from help/help.cpp rename to src/help/help.cpp diff --git a/help/mfile b/src/help/mfile similarity index 100% rename from help/mfile rename to src/help/mfile diff --git a/int/cint.c b/src/int/cint.c similarity index 100% rename from int/cint.c rename to src/int/cint.c diff --git a/int/compact.c b/src/int/compact.c similarity index 100% rename from int/compact.c rename to src/int/compact.c diff --git a/int/control.c b/src/int/control.c similarity index 100% rename from int/control.c rename to src/int/control.c diff --git a/int/depend.h b/src/int/depend.h similarity index 100% rename from int/depend.h rename to src/int/depend.h diff --git a/int/eventque.h b/src/int/eventque.h similarity index 100% rename from int/eventque.h rename to src/int/eventque.h diff --git a/int/execute.c b/src/int/execute.c similarity index 100% rename from int/execute.c rename to src/int/execute.c diff --git a/int/fileio.c b/src/int/fileio.c similarity index 100% rename from int/fileio.c rename to src/int/fileio.c diff --git a/int/genint.h b/src/int/genint.h similarity index 100% rename from int/genint.h rename to src/int/genint.h diff --git a/int/genint1.h b/src/int/genint1.h similarity index 100% rename from int/genint1.h rename to src/int/genint1.h diff --git a/int/handler.c b/src/int/handler.c similarity index 100% rename from int/handler.c rename to src/int/handler.c diff --git a/int/int.h b/src/int/int.h similarity index 100% rename from int/int.h rename to src/int/int.h diff --git a/int/intdt.c b/src/int/intdt.c similarity index 100% rename from int/intdt.c rename to src/int/intdt.c diff --git a/int/intproto.h b/src/int/intproto.h similarity index 100% rename from int/intproto.h rename to src/int/intproto.h diff --git a/int/memory.c b/src/int/memory.c similarity index 100% rename from int/memory.c rename to src/int/memory.c diff --git a/int/mfile b/src/int/mfile similarity index 100% rename from int/mfile rename to src/int/mfile diff --git a/int/nonstand.c b/src/int/nonstand.c similarity index 100% rename from int/nonstand.c rename to src/int/nonstand.c diff --git a/int/nonstand.h b/src/int/nonstand.h similarity index 100% rename from int/nonstand.h rename to src/int/nonstand.h diff --git a/int/object.c b/src/int/object.c similarity index 100% rename from int/object.c rename to src/int/object.c diff --git a/int/procaddr.c b/src/int/procaddr.c similarity index 100% rename from int/procaddr.c rename to src/int/procaddr.c diff --git a/int/process.c b/src/int/process.c similarity index 100% rename from int/process.c rename to src/int/process.c diff --git a/int/process.h b/src/int/process.h similarity index 100% rename from int/process.h rename to src/int/process.h diff --git a/int/queue.c b/src/int/queue.c similarity index 100% rename from int/queue.c rename to src/int/queue.c diff --git a/int/queue.h b/src/int/queue.h similarity index 100% rename from int/queue.h rename to src/int/queue.h diff --git a/int/rpcall.c b/src/int/rpcall.c similarity index 100% rename from int/rpcall.c rename to src/int/rpcall.c diff --git a/int/runsys.c b/src/int/runsys.c similarity index 100% rename from int/runsys.c rename to src/int/runsys.c diff --git a/int/socu.h b/src/int/socu.h similarity index 100% rename from int/socu.h rename to src/int/socu.h diff --git a/int/standard.c b/src/int/standard.c similarity index 100% rename from int/standard.c rename to src/int/standard.c diff --git a/int/typchk.c b/src/int/typchk.c similarity index 100% rename from int/typchk.c rename to src/int/typchk.c diff --git a/int/util.c b/src/int/util.c similarity index 100% rename from int/util.c rename to src/int/util.c diff --git a/kernel/kernel.cpp b/src/kernel/kernel.cpp similarity index 100% rename from kernel/kernel.cpp rename to src/kernel/kernel.cpp diff --git a/kernel/mfile b/src/kernel/mfile similarity index 100% rename from kernel/mfile rename to src/kernel/mfile diff --git a/kernel/socu.h b/src/kernel/socu.h similarity index 100% rename from kernel/socu.h rename to src/kernel/socu.h diff --git a/lgconfig/lgconfig.cpp b/src/lgconfig/lgconfig.cpp similarity index 100% rename from lgconfig/lgconfig.cpp rename to src/lgconfig/lgconfig.cpp diff --git a/lgconfig/mfile b/src/lgconfig/mfile similarity index 100% rename from lgconfig/mfile rename to src/lgconfig/mfile diff --git a/net/lognet.cpp b/src/net/lognet.cpp similarity index 100% rename from net/lognet.cpp rename to src/net/lognet.cpp diff --git a/net/mfile b/src/net/mfile similarity index 100% rename from net/mfile rename to src/net/mfile diff --git a/net/soct.h b/src/net/soct.h similarity index 100% rename from net/soct.h rename to src/net/soct.h diff --git a/net/socu.h b/src/net/socu.h similarity index 100% rename from net/socu.h rename to src/net/socu.h diff --git a/preproc/mfile b/src/preproc/mfile similarity index 100% rename from preproc/mfile rename to src/preproc/mfile diff --git a/preproc/prep.cpp b/src/preproc/prep.cpp similarity index 100% rename from preproc/prep.cpp rename to src/preproc/prep.cpp