--- malonnote/Makefile.in 2005/10/11 09:05:15 1.21 +++ malonnote/Makefile.in 2005/12/22 10:48:29 1.22 @@ -134,9 +134,8 @@ IS_MINGW_FALSE = @IS_MINGW_FALSE@ IS_MINGW_TRUE = @IS_MINGW_TRUE@ LDFLAGS = @LDFLAGS@ -LIBICONV = @LIBICONV@ LIBOBJS = @LIBOBJS@ -LIBS = `wx-config --libs` -L/usr/local/lib ${RESOBJ} ${LIBICONV} +LIBS = `wx-config --libs` ${RESOBJ} LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ @@ -195,9 +194,12 @@ @IS_MINGW_TRUE@RESOBJ = resource.o @IS_MINGW_FALSE@RESSRC = @IS_MINGW_TRUE@RESSRC = mn.rc -XRCFILE = mnResource.xrc +XRCFILE_MAC = mnResource-mac.xrc +XRCFILE_NOMAC = mnResource.xrc +@IS_DARWIN_FALSE@XRCFILE = ${XRCFILE_NOMAC} +@IS_DARWIN_TRUE@XRCFILE = ${XRCFILE_MAC} XRCSRC = mnResource.cpp -EXTRA_DIST = ${XRCFILE} mnDialog.wxg TODO Info.plist mnote.ico mnote.icns malon-small-logo.ico malon-midium-logo.ico README.euc README.txt new.template +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 mnote_DEPENDENCIES = ${RESOBJ} mnote_CXXFLAGS = -g `wx-config --cxxflags` mnote_SOURCES = \