--- malonnote/Makefile.in 2005/10/02 01:36:53 1.18 +++ malonnote/Makefile.in 2005/10/04 12:45:02 1.19 @@ -58,16 +58,20 @@ am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) -am__mnote_SOURCES_DIST = main.cpp mnFrame.cpp mnFrame.h mnModel.cpp \ - mnModel.h mnController.cpp mnController.h mnID.h mnDef.h \ +am__mnote_SOURCES_DIST = main.cpp mnFrame.cpp mnFrame.h \ + mnNotePanel.cpp mnNotePanel.h mnModel.cpp mnModel.h \ + mnFrameController.cpp mnFrameController.h \ + mnNotePanelController.cpp mnNotePanelController.h mnDef.h \ mnDialog.h mnDialog.cpp mnHtmlWindow.cpp mnHtmlWindow.h \ mnTextCtrl.cpp mnTextCtrl.h mn.rc mnResource.cpp am__objects_1 = am__objects_2 = mnote-mnResource.$(OBJEXT) am_mnote_OBJECTS = mnote-main.$(OBJEXT) mnote-mnFrame.$(OBJEXT) \ - mnote-mnModel.$(OBJEXT) mnote-mnController.$(OBJEXT) \ - mnote-mnDialog.$(OBJEXT) mnote-mnHtmlWindow.$(OBJEXT) \ - mnote-mnTextCtrl.$(OBJEXT) $(am__objects_1) $(am__objects_2) + mnote-mnNotePanel.$(OBJEXT) mnote-mnModel.$(OBJEXT) \ + mnote-mnFrameController.$(OBJEXT) \ + mnote-mnNotePanelController.$(OBJEXT) mnote-mnDialog.$(OBJEXT) \ + mnote-mnHtmlWindow.$(OBJEXT) mnote-mnTextCtrl.$(OBJEXT) \ + $(am__objects_1) $(am__objects_2) mnote_OBJECTS = $(am_mnote_OBJECTS) mnote_LDADD = $(LDADD) DEFAULT_INCLUDES = -I. -I$(srcdir) -I. @@ -200,11 +204,14 @@ main.cpp \ mnFrame.cpp \ mnFrame.h \ + mnNotePanel.cpp \ + mnNotePanel.h \ mnModel.cpp \ mnModel.h \ - mnController.cpp \ - mnController.h \ - mnID.h \ + mnFrameController.cpp \ + mnFrameController.h \ + mnNotePanelController.cpp \ + mnNotePanelController.h \ mnDef.h \ mnDialog.h \ mnDialog.cpp \ @@ -309,11 +316,13 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mnote-main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mnote-mnController.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mnote-mnDialog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mnote-mnFrame.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mnote-mnFrameController.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mnote-mnHtmlWindow.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mnote-mnModel.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mnote-mnNotePanel.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mnote-mnNotePanelController.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mnote-mnResource.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mnote-mnTextCtrl.Po@am__quote@ @@ -359,6 +368,20 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mnote_CXXFLAGS) $(CXXFLAGS) -c -o mnote-mnFrame.obj `if test -f 'mnFrame.cpp'; then $(CYGPATH_W) 'mnFrame.cpp'; else $(CYGPATH_W) '$(srcdir)/mnFrame.cpp'; fi` +mnote-mnNotePanel.o: mnNotePanel.cpp +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mnote_CXXFLAGS) $(CXXFLAGS) -MT mnote-mnNotePanel.o -MD -MP -MF "$(DEPDIR)/mnote-mnNotePanel.Tpo" -c -o mnote-mnNotePanel.o `test -f 'mnNotePanel.cpp' || echo '$(srcdir)/'`mnNotePanel.cpp; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/mnote-mnNotePanel.Tpo" "$(DEPDIR)/mnote-mnNotePanel.Po"; else rm -f "$(DEPDIR)/mnote-mnNotePanel.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='mnNotePanel.cpp' object='mnote-mnNotePanel.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mnote_CXXFLAGS) $(CXXFLAGS) -c -o mnote-mnNotePanel.o `test -f 'mnNotePanel.cpp' || echo '$(srcdir)/'`mnNotePanel.cpp + +mnote-mnNotePanel.obj: mnNotePanel.cpp +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mnote_CXXFLAGS) $(CXXFLAGS) -MT mnote-mnNotePanel.obj -MD -MP -MF "$(DEPDIR)/mnote-mnNotePanel.Tpo" -c -o mnote-mnNotePanel.obj `if test -f 'mnNotePanel.cpp'; then $(CYGPATH_W) 'mnNotePanel.cpp'; else $(CYGPATH_W) '$(srcdir)/mnNotePanel.cpp'; fi`; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/mnote-mnNotePanel.Tpo" "$(DEPDIR)/mnote-mnNotePanel.Po"; else rm -f "$(DEPDIR)/mnote-mnNotePanel.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='mnNotePanel.cpp' object='mnote-mnNotePanel.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mnote_CXXFLAGS) $(CXXFLAGS) -c -o mnote-mnNotePanel.obj `if test -f 'mnNotePanel.cpp'; then $(CYGPATH_W) 'mnNotePanel.cpp'; else $(CYGPATH_W) '$(srcdir)/mnNotePanel.cpp'; fi` + mnote-mnModel.o: mnModel.cpp @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mnote_CXXFLAGS) $(CXXFLAGS) -MT mnote-mnModel.o -MD -MP -MF "$(DEPDIR)/mnote-mnModel.Tpo" -c -o mnote-mnModel.o `test -f 'mnModel.cpp' || echo '$(srcdir)/'`mnModel.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/mnote-mnModel.Tpo" "$(DEPDIR)/mnote-mnModel.Po"; else rm -f "$(DEPDIR)/mnote-mnModel.Tpo"; exit 1; fi @@ -373,19 +396,33 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mnote_CXXFLAGS) $(CXXFLAGS) -c -o mnote-mnModel.obj `if test -f 'mnModel.cpp'; then $(CYGPATH_W) 'mnModel.cpp'; else $(CYGPATH_W) '$(srcdir)/mnModel.cpp'; fi` -mnote-mnController.o: mnController.cpp -@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mnote_CXXFLAGS) $(CXXFLAGS) -MT mnote-mnController.o -MD -MP -MF "$(DEPDIR)/mnote-mnController.Tpo" -c -o mnote-mnController.o `test -f 'mnController.cpp' || echo '$(srcdir)/'`mnController.cpp; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/mnote-mnController.Tpo" "$(DEPDIR)/mnote-mnController.Po"; else rm -f "$(DEPDIR)/mnote-mnController.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='mnController.cpp' object='mnote-mnController.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mnote_CXXFLAGS) $(CXXFLAGS) -c -o mnote-mnController.o `test -f 'mnController.cpp' || echo '$(srcdir)/'`mnController.cpp - -mnote-mnController.obj: mnController.cpp -@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mnote_CXXFLAGS) $(CXXFLAGS) -MT mnote-mnController.obj -MD -MP -MF "$(DEPDIR)/mnote-mnController.Tpo" -c -o mnote-mnController.obj `if test -f 'mnController.cpp'; then $(CYGPATH_W) 'mnController.cpp'; else $(CYGPATH_W) '$(srcdir)/mnController.cpp'; fi`; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/mnote-mnController.Tpo" "$(DEPDIR)/mnote-mnController.Po"; else rm -f "$(DEPDIR)/mnote-mnController.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='mnController.cpp' object='mnote-mnController.obj' libtool=no @AMDEPBACKSLASH@ +mnote-mnFrameController.o: mnFrameController.cpp +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mnote_CXXFLAGS) $(CXXFLAGS) -MT mnote-mnFrameController.o -MD -MP -MF "$(DEPDIR)/mnote-mnFrameController.Tpo" -c -o mnote-mnFrameController.o `test -f 'mnFrameController.cpp' || echo '$(srcdir)/'`mnFrameController.cpp; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/mnote-mnFrameController.Tpo" "$(DEPDIR)/mnote-mnFrameController.Po"; else rm -f "$(DEPDIR)/mnote-mnFrameController.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='mnFrameController.cpp' object='mnote-mnFrameController.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mnote_CXXFLAGS) $(CXXFLAGS) -c -o mnote-mnFrameController.o `test -f 'mnFrameController.cpp' || echo '$(srcdir)/'`mnFrameController.cpp + +mnote-mnFrameController.obj: mnFrameController.cpp +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mnote_CXXFLAGS) $(CXXFLAGS) -MT mnote-mnFrameController.obj -MD -MP -MF "$(DEPDIR)/mnote-mnFrameController.Tpo" -c -o mnote-mnFrameController.obj `if test -f 'mnFrameController.cpp'; then $(CYGPATH_W) 'mnFrameController.cpp'; else $(CYGPATH_W) '$(srcdir)/mnFrameController.cpp'; fi`; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/mnote-mnFrameController.Tpo" "$(DEPDIR)/mnote-mnFrameController.Po"; else rm -f "$(DEPDIR)/mnote-mnFrameController.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='mnFrameController.cpp' object='mnote-mnFrameController.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mnote_CXXFLAGS) $(CXXFLAGS) -c -o mnote-mnFrameController.obj `if test -f 'mnFrameController.cpp'; then $(CYGPATH_W) 'mnFrameController.cpp'; else $(CYGPATH_W) '$(srcdir)/mnFrameController.cpp'; fi` + +mnote-mnNotePanelController.o: mnNotePanelController.cpp +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mnote_CXXFLAGS) $(CXXFLAGS) -MT mnote-mnNotePanelController.o -MD -MP -MF "$(DEPDIR)/mnote-mnNotePanelController.Tpo" -c -o mnote-mnNotePanelController.o `test -f 'mnNotePanelController.cpp' || echo '$(srcdir)/'`mnNotePanelController.cpp; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/mnote-mnNotePanelController.Tpo" "$(DEPDIR)/mnote-mnNotePanelController.Po"; else rm -f "$(DEPDIR)/mnote-mnNotePanelController.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='mnNotePanelController.cpp' object='mnote-mnNotePanelController.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mnote_CXXFLAGS) $(CXXFLAGS) -c -o mnote-mnNotePanelController.o `test -f 'mnNotePanelController.cpp' || echo '$(srcdir)/'`mnNotePanelController.cpp + +mnote-mnNotePanelController.obj: mnNotePanelController.cpp +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mnote_CXXFLAGS) $(CXXFLAGS) -MT mnote-mnNotePanelController.obj -MD -MP -MF "$(DEPDIR)/mnote-mnNotePanelController.Tpo" -c -o mnote-mnNotePanelController.obj `if test -f 'mnNotePanelController.cpp'; then $(CYGPATH_W) 'mnNotePanelController.cpp'; else $(CYGPATH_W) '$(srcdir)/mnNotePanelController.cpp'; fi`; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/mnote-mnNotePanelController.Tpo" "$(DEPDIR)/mnote-mnNotePanelController.Po"; else rm -f "$(DEPDIR)/mnote-mnNotePanelController.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='mnNotePanelController.cpp' object='mnote-mnNotePanelController.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mnote_CXXFLAGS) $(CXXFLAGS) -c -o mnote-mnController.obj `if test -f 'mnController.cpp'; then $(CYGPATH_W) 'mnController.cpp'; else $(CYGPATH_W) '$(srcdir)/mnController.cpp'; fi` +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mnote_CXXFLAGS) $(CXXFLAGS) -c -o mnote-mnNotePanelController.obj `if test -f 'mnNotePanelController.cpp'; then $(CYGPATH_W) 'mnNotePanelController.cpp'; else $(CYGPATH_W) '$(srcdir)/mnNotePanelController.cpp'; fi` mnote-mnDialog.o: mnDialog.cpp @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mnote_CXXFLAGS) $(CXXFLAGS) -MT mnote-mnDialog.o -MD -MP -MF "$(DEPDIR)/mnote-mnDialog.Tpo" -c -o mnote-mnDialog.o `test -f 'mnDialog.cpp' || echo '$(srcdir)/'`mnDialog.cpp; \