--- malonnote/Makefile.in 2005/08/11 07:15:49 1.13 +++ malonnote/Makefile.in 2005/09/29 04:15:30 1.14 @@ -61,12 +61,13 @@ am__mnote_SOURCES_DIST = main.cpp mnFrame.cpp mnFrame.h mnModel.cpp \ mnModel.h mnController.cpp mnController.h mnID.h mnDef.h \ mnDialog.h mnDialog.cpp mnHtmlWindow.cpp mnHtmlWindow.h \ - mnTextCtrl.cpp mnTextCtrl.h mn.rc + 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) + mnote-mnTextCtrl.$(OBJEXT) $(am__objects_1) $(am__objects_2) mnote_OBJECTS = $(am_mnote_OBJECTS) mnote_LDADD = $(LDADD) DEFAULT_INCLUDES = -I. -I$(srcdir) -I. @@ -191,6 +192,9 @@ @IS_MINGW_TRUE@RESOBJ = resource.o @IS_MINGW_FALSE@RESSRC = @IS_MINGW_TRUE@RESSRC = mn.rc +XRCFILE = mnResource.xrc +XRCSRC = mnResource.cpp +XRCOBJ = mnResource.o mnote_DEPENDENCIES = ${RESOBJ} mnote_CXXFLAGS = -g `wx-config --cxxflags` mnote_SOURCES = \ @@ -209,7 +213,8 @@ mnHtmlWindow.h \ mnTextCtrl.cpp \ mnTextCtrl.h \ - ${RESSRC} + ${RESSRC} \ + ${XRCSRC} MY_DIST_DIR = MalonNote-${PACKAGE_VERSION} @IS_DARWIN_TRUE@APP = mnote.app @@ -310,6 +315,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mnote-mnFrame.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-mnResource.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mnote-mnTextCtrl.Po@am__quote@ .cpp.o: @@ -423,6 +429,20 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='mnTextCtrl.cpp' object='mnote-mnTextCtrl.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-mnTextCtrl.obj `if test -f 'mnTextCtrl.cpp'; then $(CYGPATH_W) 'mnTextCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/mnTextCtrl.cpp'; fi` + +mnote-mnResource.o: mnResource.cpp +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mnote_CXXFLAGS) $(CXXFLAGS) -MT mnote-mnResource.o -MD -MP -MF "$(DEPDIR)/mnote-mnResource.Tpo" -c -o mnote-mnResource.o `test -f 'mnResource.cpp' || echo '$(srcdir)/'`mnResource.cpp; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/mnote-mnResource.Tpo" "$(DEPDIR)/mnote-mnResource.Po"; else rm -f "$(DEPDIR)/mnote-mnResource.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='mnResource.cpp' object='mnote-mnResource.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-mnResource.o `test -f 'mnResource.cpp' || echo '$(srcdir)/'`mnResource.cpp + +mnote-mnResource.obj: mnResource.cpp +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mnote_CXXFLAGS) $(CXXFLAGS) -MT mnote-mnResource.obj -MD -MP -MF "$(DEPDIR)/mnote-mnResource.Tpo" -c -o mnote-mnResource.obj `if test -f 'mnResource.cpp'; then $(CYGPATH_W) 'mnResource.cpp'; else $(CYGPATH_W) '$(srcdir)/mnResource.cpp'; fi`; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/mnote-mnResource.Tpo" "$(DEPDIR)/mnote-mnResource.Po"; else rm -f "$(DEPDIR)/mnote-mnResource.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='mnResource.cpp' object='mnote-mnResource.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-mnResource.obj `if test -f 'mnResource.cpp'; then $(CYGPATH_W) 'mnResource.cpp'; else $(CYGPATH_W) '$(srcdir)/mnResource.cpp'; fi` uninstall-info-am: ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -698,6 +718,9 @@ uninstall-am uninstall-binPROGRAMS uninstall-info-am +${XRCSRC}:${XRCFILE} + wxrc ${XRCFILE} -v -c -o ${XRCSRC} + readme:README.txt README.euc README.euc:README