X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=Makefile.am;h=d94f59663ce410c7be7fa4306c5d5d07f5f17fa3;hb=c53612650313e842a9de1d3e8dbbcd6e23d7d7d8;hp=39e86b7911121d951a6daaf4f0228fe87d95418f;hpb=b75f396432fe4070829b3229b45b5e89f8654c8e;p=vlp.git

diff --git a/Makefile.am b/Makefile.am
index 39e86b7..d94f596 100644
--- 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 = \
@@ -36,14 +45,19 @@ BUILT_SOURCES = \
   src/net/lognet.moc.cpp \
   src/kernel/kernel.moc.cpp \
   src/edit/editor.moc.cpp \
-  src/lgconfig/lgconfig.moc.cpp \
-  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.cpp
+#  \
+#  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)
-bin_lognet_HEADERS = \
+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
@@ -53,7 +67,10 @@ clean-loggraph-extra:
 	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
@@ -68,6 +85,7 @@ clean-lognet-extra:
 	rm -f bin/lognet
 	
 bin_logker_SOURCES = \
+	$(bin_logker_HEADERS) \
 	src/kernel/kernel.cpp \
 	src/kernel/kernel.moc.cpp \
 	src/kernel/ConnectDialog.cpp \
@@ -76,7 +94,9 @@ bin_logker_SOURCES = \
 	src/kernel/OptionsDialog.cpp \
 	src/kernel/OptionsDialog.moc.cpp \
 	src/kernel/MessageDialog.cpp \
-	src/global/vlp/config.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
@@ -93,7 +113,10 @@ bin_logker_HEADERS = \
 	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/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 \
@@ -133,6 +156,7 @@ clean-logker-extra:
 	rm -f bin/logker
 	
 bin_logint_SOURCES = \
+  $(bin_logint_HEADERS) \
   src/int/cint.c \
   src/int/compact.c \
   src/int/control.c \
@@ -175,6 +199,7 @@ 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 \
@@ -184,7 +209,7 @@ bin_logedit_SOURCES = \
 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 \
@@ -229,29 +254,68 @@ clean-logedit-extra:
 	rm -f bin/logedit
 
 bin_lgconfig_SOURCES = \
+	$(bin_lgconfig_HEADERS) \
 	src/lgconfig/lgconfig.cpp \
-	src/lgconfig/lgconfig.moc.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++
-bin_logedit_HEADERS = \
+bin_lgconfigdir = src/lgconfig
+bin_lgconfig_HEADERS = \
 	src/lgconfig/lgconfig.h \
-	src/lgconfig/ui/VLPConfigWindow.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/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.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
 
@@ -259,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