Move preferences dialog layout code into separate ui file

[vlp.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 49b884a86fa2243a3864cad51420cfd273f44526..f9367881f1da70f7932966299be4bab3afe5b6f3 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 = \
@@ -161,25 +163,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