X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=c074aebfc87505ffeed1025c732ef1f2126e7985;hb=f43129215d9cc2dcd6bf5f2a4c6b1bebec34de16;hp=0ffe5b544fb6b71346bd9d681e15d07bc134984c;hpb=deab1cfe393edb3d04caf94340cb5c58aa2626ea;p=vlp.git

diff --git a/Makefile.am b/Makefile.am
index 0ffe5b5..c074aeb 100644
--- 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 = \
@@ -85,10 +87,10 @@ bin_logker_HEADERS = \
 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
+		src/kernel/ui/dialogs/LockDialog.h \
+		src/kernel/ui/dialogs/OptionsDialog.h \
+		src/kernel/ui/dialogs/KillDialog.h \
+		src/kernel/ui/dialogs/ConnectDialog.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
@@ -96,27 +98,24 @@ src/kernel/kernel.moc.cpp: \
 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/ui/dialogs/LockDialog.h:
+	uic src/kernel/ui/dialogs/LockDialog.ui -o src/kernel/ui/dialogs/LockDialog.h
 
-src/kernel/ui/optionsdialog.h:
-	uic src/kernel/ui/optionsdialog.ui -o src/kernel/ui/optionsdialog.h
+src/kernel/ui/dialogs/OptionsDialog.h:
+	uic src/kernel/ui/dialogs/OptionsDialog.ui -o src/kernel/ui/dialogs/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/dialogs/KillDialog.h:
+	uic src/kernel/ui/dialogs/KillDialog.ui -o src/kernel/ui/dialogs/KillDialog.h
 
-src/kernel/ui/connect_dialog.h:
-	uic src/kernel/ui/connect_dialog.ui -o src/kernel/ui/connect_dialog.h
+src/kernel/ui/dialogs/ConnectDialog.h:
+	uic src/kernel/ui/dialogs/ConnectDialog.ui -o src/kernel/ui/dialogs/ConnectDialog.h
 
 
 clean-logker-extra:
 	rm -f src/kernel/*.moc
 	rm -f src/kernel/*.moc.cpp
-	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 src/kernel/ui/dialogs/*.h
+	rm -f src/kernel/ui/*.h
 	rm -f bin/logker
 	
 bin_logint_SOURCES = \
@@ -161,25 +160,49 @@ bin_logint_HEADERS = \
 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 = \
+	src/edit/editor.cpp \
+	src/edit/editor.moc.cpp \
+	src/edit/ProgramStructureDialog.cpp \
+	src/edit/UnitStructureDialog.cpp \
+	src/edit/PreferencesDialog.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/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/editor.moc.cpp: \
 		src/edit/editor.h \
-		src/edit/ui/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
 	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
 
+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
+
 
 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