From fcadbfb31e9e8bd463a16369e3de2ec96a413a6a Mon Sep 17 00:00:00 2001 From: daleharvey Date: Fri, 23 Jun 2006 13:15:16 +0000 Subject: manually merging the INKBOARD_PEDRO branch into trunk (bzr r1268) --- src/ui/dialog/Makefile_insert | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'src/ui/dialog/Makefile_insert') diff --git a/src/ui/dialog/Makefile_insert b/src/ui/dialog/Makefile_insert index 7ab87c7d3..4e40b645d 100644 --- a/src/ui/dialog/Makefile_insert +++ b/src/ui/dialog/Makefile_insert @@ -5,18 +5,6 @@ ui/dialog/all: ui/dialog/libuidialog.a ui/dialog/clean: rm -f ui/dialog/libuidialog.a $(ui_libuidialog_a_OBJECTS) -if WITH_INKBOARD -inkboard_dialogs = \ - ui/dialog/session-player.cpp \ - ui/dialog/session-player.h \ - ui/dialog/whiteboard-connect.cpp \ - ui/dialog/whiteboard-connect.h \ - ui/dialog/whiteboard-sharewithuser.cpp \ - ui/dialog/whiteboard-sharewithuser.h \ - ui/dialog/whiteboard-sharewithchat.cpp \ - ui/dialog/whiteboard-sharewithchat.h -endif - ui_dialog_libuidialog_a_SOURCES = \ ui/dialog/dialog-manager.cpp \ ui/dialog/dialog-manager.h \ @@ -54,7 +42,6 @@ ui_dialog_libuidialog_a_SOURCES = \ ui/dialog/transformation.h \ ui/dialog/tree-editor.cpp \ ui/dialog/tree-editor.h \ - $(inkboard_dialogs) \ ui/dialog/xml-editor.cpp \ ui/dialog/xml-editor.h \ ui/dialog/aboutbox.cpp \ -- cgit v1.2.3