X-Git-Url: https://git.dlugolecki.net.pl/?p=vlp.git;a=blobdiff_plain;f=Makefile.am;fp=Makefile.am;h=d94f59663ce410c7be7fa4306c5d5d07f5f17fa3;hp=25ac710df92557acd7245b9212042199b038a12e;hb=1c031379a5928fe8a268f4b54bbef4b898a1ee20;hpb=3379d2caf9ee3a5b495144b395ccfa053fe699f0

diff --git a/Makefile.am b/Makefile.am
index 25ac710..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,8 +45,8 @@ 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/lgconfig/lgconfig.moc.cpp
+
 #  \
 #  src/help/help.moc
 
@@ -85,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
@@ -102,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 \
@@ -291,9 +305,16 @@ clean-lgconfig-extra:
 
 bin_logcomp_SOURCES = \
 	src/preproc/prep.cpp \
-	src/preproc/prep.moc.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