#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 = \
bin_logker_SOURCES = \
src/kernel/kernel.cpp \
src/kernel/kernel.moc.cpp \
- src/kernel/lock.cpp \
- src/kernel/options.cpp \
- src/kernel/options.moc.cpp \
- src/kernel/kill_interpreter_dialog.cpp \
- src/kernel/connect_dialog.cpp \
+ src/kernel/LockDialog.cpp \
+ src/kernel/OptionsDialog.cpp \
+ src/kernel/OptionsDialog.moc.cpp \
+ src/kernel/KillDialog.cpp \
+ src/kernel/ConnectDialog.cpp \
src/global/vlp/config.cpp
bin_logker_CPPFLAGS = $(bin_logker_CFLAGS)
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/kill_interpreter_dialog.h \
- src/kernel/connect_dialog.h \
+ src/kernel/LockDialog.h \
+ src/kernel/OptionsDialog.h \
+ src/kernel/KillDialog.h \
+ src/kernel/ConnectDialog.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
+ src/kernel/ui/KernelWindow.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-qt4 src/kernel/OptionsDialog.h -o src/kernel/OptionsDialog.moc.cpp
# $(MOC) -i src/kernel/kernel.cpp -o src/kernel/kernel.moc
-src/kernel/ui/kernelwindow.h:
- uic src/kernel/ui/kernelwindow.ui -o src/kernel/ui/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/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 = \
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
rm -f bin/logedit