Use c++11 auto keyword

[vlp.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 326f22eb477b1965cf0198e866bd2c10c3f5a3e4..819b8844b2faffb01ae4a0243994bc0b0136e726 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,9 @@ MOC = ${MOCDIR}/${MOCNAME}
 
 #AM_CXXFLAGS= -Wall -pedantic -Wextra -fno-strength-reduce
 #AM_CXXFLAGS = -m32
-AM_CXXFLAGS = -I$(top_srcdir)/src/global -I${QTDIR}/include/qt4 -pedantic -Wall -Wextra -DQT3_SUPPORT 
+
+# @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_LDFLAGS= -fPIC -L$(QTDIR)/lib -lQtCore -lQtGui -lQt3Support
 
 EXTRA_DIST = \
@@ -68,35 +70,55 @@ bin_logker_SOURCES = \
        src/kernel/kernel.moc.cpp \
        src/kernel/lock.cpp \
        src/kernel/options.cpp \
-       src/kernel/options.moc.cpp
+       src/kernel/options.moc.cpp \
+       src/kernel/kill_interpreter_dialog.cpp \
+       src/kernel/connect_dialog.cpp \
+       src/global/vlp/config.cpp
 bin_logker_CPPFLAGS = $(bin_logker_CFLAGS)
-bin_logker_LDADD = $(bin_logker_LIBS) -lconfig++
+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/kernel.moc.cpp: src/kernel/kernel.h src/kernel/kernelwindow.h src/kernel/lock_dialog.h src/kernel/optionsdialog.h
+       src/kernel/options.h \
+       src/kernel/kill_interpreter_dialog.h \
+       src/kernel/connect_dialog.h \
+       src/global/vlp/config.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
 #      $(MOC) -i src/kernel/kernel.cpp -o src/kernel/kernel.moc
 
-src/kernel/kernelwindow.h:
-       uic src/kernel/kernelwindow.ui -o src/kernel/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/lock_dialog.h:
-       uic src/kernel/lock_dialog.ui -o src/kernel/lock_dialog.h
+src/kernel/ui/optionsdialog.h:
+       uic src/kernel/ui/optionsdialog.ui -o src/kernel/ui/optionsdialog.h
 
-src/kernel/optionsdialog.h:
-       uic src/kernel/optionsdialog.ui -o src/kernel/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/connect_dialog.h:
+       uic src/kernel/ui/connect_dialog.ui -o src/kernel/ui/connect_dialog.h
 
 
 clean-logker-extra:
        rm -f src/kernel/*.moc
        rm -f src/kernel/*.moc.cpp
-       rm -f src/kernel/kernelwindow.h
-       rm -f src/kernel/lock_dialog.h
-       rm -f src/kernel/optionsdialog.h
+       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 bin/logker
        
 bin_logint_SOURCES = \
@@ -146,14 +168,21 @@ 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/editor.h \
+       src/edit/ui/editor.h
 
-src/edit/editor.moc.cpp: src/edit/editor.h
+src/edit/editor.moc.cpp: \
+               src/edit/editor.h \
+               src/edit/ui/editor.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/editor.h:
+       uic src/edit/ui/editor.ui -o src/edit/ui/editor.h
+
 
 clean-logedit-extra:
+       rm -f src/edit/ui/editor.h
        rm -f src/edit/*.moc.cpp
        rm -f bin/modules/logedit
        rm -f bin/logedit