--- malonnote/Makefile.in 2005/08/07 23:24:19 1.11 +++ malonnote/Makefile.in 2005/08/07 23:43:46 1.12 @@ -14,7 +14,7 @@ @SET_MAKE@ -SOURCES = app.c $(mnote_SOURCES) +SOURCES = $(mnote_SOURCES) srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -38,7 +38,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@IS_DARWIN_TRUE@noinst_PROGRAMS = mnote$(EXEEXT) app$(EXEEXT) +@IS_DARWIN_TRUE@noinst_PROGRAMS = mnote$(EXEEXT) @IS_DARWIN_FALSE@bin_PROGRAMS = mnote$(EXEEXT) DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ @@ -58,9 +58,6 @@ am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) -app_SOURCES = app.c -app_OBJECTS = app.$(OBJEXT) -app_LDADD = $(LDADD) 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 mn.rc @@ -74,17 +71,17 @@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ -o $@ -SOURCES = app.c $(mnote_SOURCES) -DIST_SOURCES = app.c $(am__mnote_SOURCES_DIST) +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(mnote_SOURCES) +DIST_SOURCES = $(am__mnote_SOURCES_DIST) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -217,7 +214,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .c .cpp .o .obj +.SUFFIXES: .cpp .o .obj am--refresh: @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @@ -294,9 +291,6 @@ clean-noinstPROGRAMS: -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) -@IS_DARWIN_FALSE@app$(EXEEXT): $(app_OBJECTS) $(app_DEPENDENCIES) -@IS_DARWIN_FALSE@ @rm -f app$(EXEEXT) -@IS_DARWIN_FALSE@ $(LINK) $(app_LDFLAGS) $(app_OBJECTS) $(app_LDADD) $(LIBS) mnote$(EXEEXT): $(mnote_OBJECTS) $(mnote_DEPENDENCIES) @rm -f mnote$(EXEEXT) $(CXXLINK) $(mnote_LDFLAGS) $(mnote_OBJECTS) $(mnote_LDADD) $(LIBS) @@ -307,7 +301,6 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/app.Po@am__quote@ @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@ @@ -315,20 +308,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mnote-mnHtmlWindow.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mnote-mnModel.Po@am__quote@ -.c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - .cpp.o: @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @@ -717,7 +696,7 @@ @IS_DARWIN_TRUE@ cp -p mnote.icns ./${APP}/Contents/Resources/ @IS_DARWIN_TRUE@ echo -n "APPL????" > ./${APP}/Contents/PkgInfo -@IS_DARWIN_TRUE@appinst: +@IS_DARWIN_TRUE@appinst: app @IS_DARWIN_TRUE@ cp -pr mnote.app /Applications/ @IS_DARWIN_TRUE@distsrc: