From: werner s. <wsc...@us...> - 2005-01-14 10:49:26
|
Update of /cvsroot/lmuse/muse/synti/simpledrums In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30648/synti/simpledrums Modified Files: Tag: REL07 Makefile Log Message: libtool >1.4 patch Index: Makefile =================================================================== RCS file: /cvsroot/lmuse/muse/synti/simpledrums/Attic/Makefile,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Makefile 13 Dec 2004 20:06:51 -0000 1.1.2.1 --- Makefile 14 Jan 2005 10:49:10 -0000 1.1.2.2 *************** *** 1,6 **** ! # Makefile.in generated by automake 1.7 from Makefile.am. # synti/simpledrums/Makefile. Generated from Makefile.in by configure. ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation --- 1,6 ---- ! # Makefile.in generated by automake 1.7.7 from Makefile.am. # synti/simpledrums/Makefile. Generated from Makefile.in by configure. ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation *************** *** 24,28 **** am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ! INSTALL = /usr//bin/install -c install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c --- 24,28 ---- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ! INSTALL = /bin/install -c install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c *************** *** 37,49 **** POST_UNINSTALL = : host_triplet = i686-pc-linux-gnu ! ACLOCAL = ${SHELL} /usr/local/src/muse_rel07/muse/missing --run aclocal-1.7 -I m4 ALSA_CFLAGS = ALSA_LIBS = -lasound -lm -ldl AMDEP_FALSE = # AMDEP_TRUE = ! AMTAR = ${SHELL} /usr/local/src/muse_rel07/muse/missing --run tar ! AUTOCONF = ${SHELL} /usr/local/src/muse_rel07/muse/missing --run autoconf ! AUTOHEADER = ${SHELL} /usr/local/src/muse_rel07/muse/missing --run autoheader ! AUTOMAKE = ${SHELL} /usr/local/src/muse_rel07/muse/missing --run automake-1.7 AWK = gawk CC = gcc --- 37,50 ---- POST_UNINSTALL = : host_triplet = i686-pc-linux-gnu ! ACLOCAL = ${SHELL} /home/ws/projects/muse/muse07/missing --run aclocal-1.7 -I m4 ALSA_CFLAGS = ALSA_LIBS = -lasound -lm -ldl AMDEP_FALSE = # AMDEP_TRUE = ! AMTAR = ${SHELL} /home/ws/projects/muse/muse07/missing --run tar ! AR = ar ! AUTOCONF = ${SHELL} /home/ws/projects/muse/muse07/missing --run autoconf ! AUTOHEADER = ${SHELL} /home/ws/projects/muse/muse07/missing --run autoheader ! AUTOMAKE = ${SHELL} /home/ws/projects/muse/muse07/missing --run automake-1.7 AWK = gawk CC = gcc *************** *** 61,67 **** DOCBOOKSTYLE = DOCBOOKTARGETS = ! DOT = /usr//bin/dot ! DOTPATH = /usr//bin ! DOXYGEN = /usr//bin/doxygen DOXYGEN_TREEVIEW = YES ECHO = echo --- 62,68 ---- DOCBOOKSTYLE = DOCBOOKTARGETS = ! DOT = /usr/bin/dot ! DOTPATH = /usr/bin ! DOXYGEN = /usr/bin/doxygen DOXYGEN_TREEVIEW = YES ECHO = echo *************** *** 70,77 **** ECHO_T = EGREP = grep -E EXEEXT = FLUIDSYNTHDIRS = fluid fluidsynth ! FST_CFLAGS = ! FST_LIBS = GIVERTCAP = HAVEDOT = YES --- 71,82 ---- ECHO_T = EGREP = grep -E + ENABLEFLUIDSYNTH_FALSE = # + ENABLEFLUIDSYNTH_TRUE = EXEEXT = + F77 = g77 + FFLAGS = FLUIDSYNTHDIRS = fluid fluidsynth ! FST_CFLAGS = -I/usr/include/vst ! FST_LIBS = -lfst -lwine -lwine_unicode GIVERTCAP = HAVEDOT = YES *************** *** 88,97 **** JACK_CFLAGS = JACK_LIBS = -ljack ! JADE = openjade LADCCA_CFLAGS = LADCCA_LIBS = LDFLAGS = LIBOBJS = ! LIBS = -lasound -lm -ldl -L/usr/local/qt/lib -lqt-mt -lqui LIBTOOL = $(SHELL) $(top_builddir)/libtool LN_S = ln -s --- 93,102 ---- JACK_CFLAGS = JACK_LIBS = -ljack ! JADE = LADCCA_CFLAGS = LADCCA_LIBS = LDFLAGS = LIBOBJS = ! LIBS = -lasound -lm -ldl -L/usr/qt/lib -lqt-mt -lqui LIBTOOL = $(SHELL) $(top_builddir)/libtool LN_S = ln -s *************** *** 100,125 **** MAINTAINER_MODE_FALSE = MAINTAINER_MODE_TRUE = # ! MAKEINFO = ${SHELL} /usr/local/src/muse_rel07/muse/missing --run makeinfo ! MOC = /usr/local/qt/bin/moc ! MUSECXXFLAGS = -g -fno-exceptions -Wall -W -D_GNU_SOURCE -D_REENTRANT -DQT_CLEAN_NAMESPACE -DQT_NO_COMPAT -I$(top_srcdir) -I$(top_srcdir)/muse/widgets $(QT_CFLAGS) ! NSGMLS = onsgmls OBJEXT = o PACKAGE = muse PACKAGE_BUGREPORT = PACKAGE_NAME = MusE ! PACKAGE_STRING = MusE 0.7.1pre2 PACKAGE_TARNAME = muse ! PACKAGE_VERSION = 0.7.1pre2 PATH_SEPARATOR = : ! PCH = ! PCH_FALSE = ! PCH_TRUE = # ! PERL = /usr//bin/perl ! PKG_CONFIG = /usr//bin/pkg-config ! QT_CFLAGS = -I/usr/local/qt/include ! QT_LIBS = -L/usr/local/qt/lib -lqt-mt -lqui RANLIB = ranlib RTCAP_FALSE = RTCAP_TRUE = # SET_MAKE = SHELL = /bin/sh --- 105,132 ---- MAINTAINER_MODE_FALSE = MAINTAINER_MODE_TRUE = # ! MAKEINFO = ${SHELL} /home/ws/projects/muse/muse07/missing --run makeinfo ! MOC = /usr/qt/bin/moc ! MUSECXXFLAGS = -g -fno-exceptions -Wall -W -D_GNU_SOURCE -D_REENTRANT -DQT_CLEAN_NAMESPACE -DQT_NO_COMPAT -I$(top_srcdir) -I$(top_srcdir)/muse/widgets $(QT_CFLAGS) -Winvalid-pch ! NSGMLS = OBJEXT = o PACKAGE = muse PACKAGE_BUGREPORT = PACKAGE_NAME = MusE ! PACKAGE_STRING = MusE 0.7.1pre3 PACKAGE_TARNAME = muse ! PACKAGE_VERSION = 0.7.1pre3 PATH_SEPARATOR = : ! PCH = yes ! PCH_FALSE = # ! PCH_TRUE = ! PERL = /bin/perl ! PKG_CONFIG = /usr/bin/pkg-config ! QT_CFLAGS = -I/usr/qt/include ! QT_LIBS = -L/usr/qt/lib -lqt-mt -lqui RANLIB = ranlib RTCAP_FALSE = RTCAP_TRUE = # + SAMPLERATE_CFLAGS = + SAMPLERATE_LIBS = -lsamplerate SET_MAKE = SHELL = /bin/sh *************** *** 129,142 **** SUIDBUILD = no SUIDINSTALL = no ! UIC = /usr/local/qt/bin/uic ! VERSION = 0.7.1pre2 ! VST_SUPPORT_FALSE = ! VST_SUPPORT_TRUE = # X_CFLAGS = -I/usr/X11R6/include X_EXTRA_LIBS = X_LIBS = -L/usr/X11R6/lib X_PRE_LIBS = -lSM -lICE ac_ct_CC = gcc ac_ct_CXX = g++ ac_ct_RANLIB = ranlib ac_ct_STRIP = strip --- 136,151 ---- SUIDBUILD = no SUIDINSTALL = no ! UIC = /usr/qt/bin/uic ! VERSION = 0.7.1pre3 ! VST_SUPPORT_FALSE = # ! VST_SUPPORT_TRUE = X_CFLAGS = -I/usr/X11R6/include X_EXTRA_LIBS = X_LIBS = -L/usr/X11R6/lib X_PRE_LIBS = -lSM -lICE + ac_ct_AR = ar ac_ct_CC = gcc ac_ct_CXX = g++ + ac_ct_F77 = g77 ac_ct_RANLIB = ranlib ac_ct_STRIP = strip *************** *** 146,149 **** --- 155,159 ---- am__fastdepCXX_TRUE = am__include = include + am__leading_dot = . am__quote = bindir = ${exec_prefix}/bin *************** *** 155,159 **** datadir = ${prefix}/share exec_prefix = ${prefix} ! have_docbook = no host = i686-pc-linux-gnu host_alias = --- 165,169 ---- datadir = ${prefix}/share exec_prefix = ${prefix} ! have_docbook = host = i686-pc-linux-gnu host_alias = *************** *** 163,167 **** includedir = ${prefix}/include infodir = ${prefix}/info ! install_sh = /usr/local/src/muse_rel07/muse/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec --- 173,177 ---- includedir = ${prefix}/include infodir = ${prefix}/info ! install_sh = /home/ws/projects/muse/muse07/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec *************** *** 169,173 **** mandir = ${prefix}/man oldincludedir = /usr/include ! prefix = /usr/local program_transform_name = s,x,x, sbindir = ${exec_prefix}/sbin --- 179,183 ---- mandir = ${prefix}/man oldincludedir = /usr/include ! prefix = /usr program_transform_name = s,x,x, sbindir = ${exec_prefix}/sbin *************** *** 176,180 **** target_alias = ! AM_CXXFLAGS = $(MUSECXXFLAGS) -I.. -I$(top_srcdir)/synti -I$(top_srcdir)/muse/widgets -DQT_SHARED -DQT_THREAD_SUPPORT -DQT_PLUGIN -fPIC -O3 -ffast-math -fno-exceptions -include $(top_srcdir)/all-pic.h AM_CPPFLAGS = --- 186,190 ---- target_alias = ! AM_CXXFLAGS = $(MUSECXXFLAGS) -I.. -I$(top_srcdir)/synti -I$(top_srcdir)/muse/widgets -DQT_SHARED -DQT_THREAD_SUPPORT -DQT_PLUGIN -fPIC -O3 -fno-rtti -ffast-math -fno-exceptions -include $(top_srcdir)/all-pic.h AM_CPPFLAGS = *************** *** 211,214 **** --- 221,225 ---- EXTRA_DIST = README ReleaseNotes.txt COPYING subdir = synti/simpledrums + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h *************** *** 248,254 **** $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(simpledrums_la_SOURCES) ! DIST_COMMON = README $(top_srcdir)/common.am \ ! $(top_srcdir)/synti/synti-install.am COPYING Makefile.am \ ! Makefile.in SOURCES = $(simpledrums_la_SOURCES) $(nodist_simpledrums_la_SOURCES) --- 259,264 ---- $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(simpledrums_la_SOURCES) ! DIST_COMMON = README $(srcdir)/Makefile.in $(top_srcdir)/common.am \ ! $(top_srcdir)/synti/synti-install.am COPYING Makefile.am SOURCES = $(simpledrums_la_SOURCES) $(nodist_simpledrums_la_SOURCES) *************** *** 307,317 **** include ./$(DEPDIR)/ssplugingui.Plo - distclean-depend: - -rm -rf ./$(DEPDIR) - .cpp.o: if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ! then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ fi --- 317,324 ---- include ./$(DEPDIR)/ssplugingui.Plo .cpp.o: if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ! then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ fi *************** *** 323,328 **** .cpp.obj: if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ ! -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`; \ ! then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ fi --- 330,335 ---- .cpp.obj: if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ ! -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ! then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ fi *************** *** 330,339 **** # depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \ # $(CXXDEPMODE) $(depcomp) \ ! # $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` .cpp.lo: if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ! then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ fi --- 337,346 ---- # depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \ # $(CXXDEPMODE) $(depcomp) \ ! # $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` .cpp.lo: if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ! then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ fi *************** *** 412,420 **** distdir: $(DISTFILES) ! $(mkinstalldirs) $(distdir)/$(top_srcdir) $(distdir)/$(top_srcdir)/synti @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ --- 419,429 ---- distdir: $(DISTFILES) ! $(mkinstalldirs) $(distdir)/../.. $(distdir)/../../synti @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ *************** *** 438,448 **** done check-am: all-am ! check: check-am all-am: Makefile $(LTLIBRARIES) installdirs: $(mkinstalldirs) $(DESTDIR)$(synthidir) ! ! install: install-am install-exec: install-exec-am install-data: install-data-am --- 447,458 ---- done check-am: all-am ! check: $(BUILT_SOURCES) ! $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) installdirs: $(mkinstalldirs) $(DESTDIR)$(synthidir) ! install: $(BUILT_SOURCES) ! $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am install-data: install-data-am *************** *** 465,469 **** distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: --- 475,479 ---- distclean-generic: ! -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: *************** *** 477,483 **** distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am --- 487,495 ---- distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags dvi: dvi-am *************** *** 500,503 **** --- 512,517 ---- maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic *************** *** 520,529 **** .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-synthiLTLIBRARIES ctags distclean \ ! distclean-compile distclean-depend distclean-generic \ ! distclean-libtool distclean-tags distdir dvi dvi-am info \ ! info-am install install-am install-data install-data-am \ ! install-exec install-exec-am install-info install-info-am \ ! install-man install-strip install-synthiLTLIBRARIES \ ! installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ --- 534,543 ---- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-synthiLTLIBRARIES ctags distclean \ ! distclean-compile distclean-generic distclean-libtool \ ! distclean-tags distdir dvi dvi-am info info-am install \ ! install-am install-data install-data-am install-exec \ ! install-exec-am install-info install-info-am install-man \ ! install-strip install-synthiLTLIBRARIES installcheck \ ! installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ *************** *** 540,556 **** .ui.o: %.h $(UIC) -L $(top_srcdir)/muse/widgets -o $*.cpp -impl $*.h $*.ui ! $(MOC) $*.h -o moc_$*.cpp ! $(CXXCOMPILE) -c $*.cpp -o base_$*.o ! $(CXXCOMPILE) -c moc_$*.cpp -o moc_$*.o ! $(CXXLINK) -r base_$*.o moc_$*.o -o $*.o ! $(RM) $*.cpp moc_$*.cpp base_$*.o moc_$*.o .ui.lo: %.h $(UIC) -L $(top_srcdir)/muse/widgets -o $*.cpp -impl $*.h $*.ui ! $(MOC) $*.h -o moc_$*.cpp ! $(LTCXXCOMPILE) -c $*.cpp -o base_$*.lo ! $(LTCXXCOMPILE) -c moc_$*.cpp -o moc_$*.lo ! $(CXXLINK) -r base_$*.lo moc_$*.lo -o $*.lo ! $(RM) $*.cpp moc_$*.cpp base_$*.lo moc_$*.lo base_$*.o moc_$*.o moc_%.cpp: %.h --- 554,566 ---- .ui.o: %.h $(UIC) -L $(top_srcdir)/muse/widgets -o $*.cpp -impl $*.h $*.ui ! $(MOC) $*.h >> $*.cpp ! $(CXXCOMPILE) -c $*.cpp -o $*.o ! $(RM) $*.cpp moc_$*.cpp moc_$*.o .ui.lo: %.h $(UIC) -L $(top_srcdir)/muse/widgets -o $*.cpp -impl $*.h $*.ui ! $(MOC) $*.h >> $*.cpp ! $(LTCXXCOMPILE) -c $*.cpp -o $*.lo ! $(RM) $*.cpp moc_$*.cpp moc_$*.lo moc_$*.o moc_%.cpp: %.h |