--- malonnote/Makefile.am 2005/07/29 10:59:24 1.2.2.1 +++ malonnote/Makefile.am 2006/10/24 05:53:29 1.26 @@ -4,7 +4,6 @@ bin_PROGRAMS = mnote endif -EXTRA_DIST = mnView.wxg TODO Info.plist mnote.ico mnote.icns malon-small-logo.ico README.euc README.txt if IS_MINGW RESOBJ = resource.o @@ -14,23 +13,61 @@ RESSRC = endif -LIBS = `wx-config --libs` -L/usr/local/lib -liconv ${RESOBJ} +XRCFILE_MAC = mnResource-mac.xrc +XRCFILE_NOMAC = mnResource.xrc + +if IS_DARWIN +XRCFILE = ${XRCFILE_MAC} +else +XRCFILE = ${XRCFILE_NOMAC} +endif + +XRCSRC = mnResource.cpp + +EXTRA_DIST = ${XRCFILE_MAC} \ + ${XRCFILE_NOMAC} \ + mnDialog.wxg \ + TODO \ + Info.plist \ + mnote.ico \ + mnote.icns \ + malon-small-logo.ico \ + malon-midium-logo.ico \ + README.euc \ + README.txt \ + new.template \ + wxMac2.6.2-mnote.patch + +LIBS = `wx-config --libs` ${RESOBJ} ${LIBICONV} mnote_DEPENDENCIES = ${RESOBJ} -mnote_CXXFLAGS = -g `wx-config --cxxflags` -I/usr/local/include +mnote_CXXFLAGS = -g `wx-config --cxxflags` mnote_SOURCES = \ 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 \ - ${RESSRC} - + mnDialog.h \ + mnDialog.cpp \ + mnHtmlWindow.cpp \ + mnHtmlWindow.h \ + mnTextCtrl.cpp \ + mnTextCtrl.h \ + ${RESSRC} \ + ${XRCSRC} + +${XRCSRC}:${XRCFILE} + wxrc ${XRCFILE} -c -o ${XRCSRC} + readme:README.txt README.euc README.euc:README @@ -43,7 +80,7 @@ if IS_DARWIN APP=mnote.app -app: +app: mnote rm -fr ./${APP} mkdir -p ./${APP}/Contents/MacOS/ mkdir -p ./${APP}/Contents/Resources/ @@ -52,28 +89,42 @@ cp -p mnote.icns ./${APP}/Contents/Resources/ echo -n "APPL????" > ./${APP}/Contents/PkgInfo +appinst: app + cp -pr mnote.app /Applications/ + +distsrc: + cvs2cl.pl + make dist + mv ${DIST_ARCHIVES} ${MY_DIST_DIR}-src.tar.gz + distosx: + strip mnote mkdir ${MY_DIST_DIR} cp -r ${APP} ${MY_DIST_DIR} cp README* ${MY_DIST_DIR} cp COPYING ${MY_DIST_DIR}/LICENSE + cp new.template ${MY_DIST_DIR}/new.template tar zcvf ${MY_DIST_DIR}-osx.tar.gz ${MY_DIST_DIR} rm -fr ${MY_DIST_DIR} endif distgtk: + strip mnote mkdir ${MY_DIST_DIR} cp mnote ${MY_DIST_DIR} cp README* ${MY_DIST_DIR} cp COPYING ${MY_DIST_DIR}/LICENSE + cp new.template ${MY_DIST_DIR}/new.template tar zcvf ${MY_DIST_DIR}-gtk.tar.gz ${MY_DIST_DIR} rm -fr ${MY_DIST_DIR} distwin: + strip mnote.exe mkdir ${MY_DIST_DIR} cp mnote.exe ${MY_DIST_DIR} cp README* ${MY_DIST_DIR} cp COPYING ${MY_DIST_DIR}/LICENSE + cp new.template ${MY_DIST_DIR}/new.template zip -r ${MY_DIST_DIR}-win.zip ${MY_DIST_DIR} rm -fr ${MY_DIST_DIR}