X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=Makefile.am;h=410de45e6cf49017855ee125901676c830d96bf4;hb=02fadcf3ea33e60f2d8badbc8d83758c91a5c34d;hp=13dddd85a78ec8c1e2a04fd64220527f99ea03f3;hpb=51482069fdcb6419521f9f5cfcff5980a185428b;p=vlp.git

diff --git a/Makefile.am b/Makefile.am
index 13dddd8..410de45 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,10 +20,10 @@ EXTRA_DIST = \
 	doc/CodingStyle \
 	doc/vlp.cfg.sample
 
-#   bin/loggraph   \
 #  bin/loghelp
 
 bin_PROGRAMS = \
+  bin/loggraph   \
   bin/lognet \
   bin/logker \
   bin/logint \
@@ -32,7 +32,7 @@ bin_PROGRAMS = \
   bin/logcomp
 
 BUILT_SOURCES = \
-  src/graph/loggraph.moc \
+  src/graph/loggraph.moc.cpp \
   src/net/lognet.moc.cpp \
   src/kernel/kernel.moc.cpp \
   src/edit/editor.moc.cpp \
@@ -40,11 +40,13 @@ BUILT_SOURCES = \
   src/preproc/prep.moc.cpp \
   src/help/help.moc
 
-bin_loggraph_SOURCES = src/graph/loggraph.cpp src/graph/loggraph.moc
+bin_loggraph_SOURCES = src/graph/loggraph.cpp src/graph/loggraph.moc.cpp
 bin_loggraph_CPPFLAGS = $(bin_loggraph_CFLAGS)
 bin_loggraph_LDADD = $(bin_loggraph_LIBS)
-src/graph/loggraph.moc: 
-	$(MOC) -i src/graph/loggraph.cpp -o src/graph/loggraph.moc
+bin_lognet_HEADERS = \
+	src/graph/loggraph.h
+src/graph/loggraph.moc.cpp:
+	$(MOC) src/graph/loggraph.h -o src/graph/loggraph.moc.cpp
 
 clean-loggraph-extra:
 	rm -f src/graph/*.moc.cpp
@@ -68,57 +70,66 @@ clean-lognet-extra:
 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/ConnectDialog.cpp \
+	src/kernel/KillDialog.cpp \
+	src/kernel/LockDialog.cpp \
+	src/kernel/OptionsDialog.cpp \
+	src/kernel/OptionsDialog.moc.cpp \
+	src/kernel/MessageDialog.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/ConnectDialog.h \
+	src/kernel/KillDialog.h \
+	src/kernel/LockDialog.h \
+	src/kernel/OptionsDialog.h \
+	src/kernel/MessageDialog.h \
+	src/kernel/ui/KernelWindow.h \
+	src/kernel/ui/dialogs/ConnectDialog.h \
+	src/kernel/ui/dialogs/KillDialog.h \
+	src/kernel/ui/dialogs/LockDialog.h \
+	src/kernel/ui/dialogs/OptionsDialog.h \
+	src/kernel/ui/dialogs/MessageDialog.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 \
+		src/kernel/ui/dialogs/MessageDialog.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/dialogs/LockDialog.h:
+	uic src/kernel/ui/dialogs/LockDialog.ui -o src/kernel/ui/dialogs/LockDialog.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/OptionsDialog.h:
+	uic src/kernel/ui/dialogs/OptionsDialog.ui -o src/kernel/ui/dialogs/OptionsDialog.h
 
-src/kernel/ui/optionsdialog.h:
-	uic src/kernel/ui/optionsdialog.ui -o src/kernel/ui/optionsdialog.h
+src/kernel/ui/dialogs/KillDialog.h:
+	uic src/kernel/ui/dialogs/KillDialog.ui -o src/kernel/ui/dialogs/KillDialog.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/ConnectDialog.h:
+	uic src/kernel/ui/dialogs/ConnectDialog.ui -o src/kernel/ui/dialogs/ConnectDialog.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/MessageDialog.h:
+	uic src/kernel/ui/dialogs/MessageDialog.ui -o src/kernel/ui/dialogs/MessageDialog.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 = \
@@ -167,7 +178,9 @@ bin_logedit_SOURCES = \
 	src/edit/editor.cpp \
 	src/edit/editor.moc.cpp \
 	src/edit/ProgramStructureDialog.cpp \
-	src/edit/UnitStructureDialog.cpp
+	src/edit/UnitStructureDialog.cpp \
+	src/edit/PreferencesDialog.cpp \
+	src/edit/FindDialog.cpp
 bin_logedit_CPPFLAGS = $(bin_logedit_CFLAGS)
 bin_logedit_LDADD = $(bin_logedit_LIBS)
 bin_logeditdir = src/edit
@@ -177,13 +190,19 @@ bin_logedit_HEADERS =\
 	src/edit/ProgramStructureDialog.h \
 	src/edit/ui/dialogs/ProgramStructureDialog.h \
 	src/edit/UnitStructureDialog.h \
-	src/edit/ui/dialogs/UnitStructureDialog.h
+	src/edit/ui/dialogs/UnitStructureDialog.h \
+	src/edit/PreferencesDialog.h \
+	src/edit/ui/dialogs/PreferencesDialog.h \
+	src/edit/FindDialog.h \
+	src/edit/ui/dialogs/FindDialog.h
 
 src/edit/editor.moc.cpp: \
 		src/edit/editor.h \
 		src/edit/ui/editor.h \
 		src/edit/ui/dialogs/ProgramStructureDialog.h \
-		src/edit/ui/dialogs/UnitStructureDialog.h
+		src/edit/ui/dialogs/UnitStructureDialog.h \
+		src/edit/ui/dialogs/PreferencesDialog.h \
+		src/edit/ui/dialogs/FindDialog.h
 	moc-qt4 src/edit/editor.h -o src/edit/editor.moc.cpp
 #	$(MOC) src/edit/editor.h -o src/edit/editor.moc.cpp
 
@@ -196,6 +215,12 @@ 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
+
+src/edit/ui/dialogs/FindDialog.h:
+	uic src/edit/ui/dialogs/FindDialog.ui -o src/edit/ui/dialogs/FindDialog.h
+
 
 clean-logedit-extra:
 	rm -f src/edit/ui/dialogs/*.h
@@ -273,6 +298,7 @@ clean-am: \
 	rm -rf bin/compile
 	rm -rf bin/examp
 	rm -f bin/vlp.cfg
+	find ./ -name *.o -exec rm {} \;
 
 CLEANFILES = \
 	%.o \