Created
January 15, 2012 16:54
-
-
Save Ionic/1616421 to your computer and use it in GitHub Desktop.
debug builsys.mk.in
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/Makefile b/Makefile | |
| index c21acbc..60f8925 100644 | |
| --- a/Makefile | |
| +++ b/Makefile | |
| @@ -7,19 +7,11 @@ include buildsys.mk | |
| install-extra: | |
| for i in audacious.pc audclient.pc; do \ | |
| ${INSTALL_STATUS}; \ | |
| - if ${MKDIR_P} ${DESTDIR}${libdir}/pkgconfig && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/pkgconfig/$$i; then \ | |
| - ${INSTALL_OK}; \ | |
| - else \ | |
| - ${INSTALL_FAILED}; \ | |
| - fi; \ | |
| + ${MKDIR_P} ${DESTDIR}${libdir}/pkgconfig && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/pkgconfig/$$i; \ | |
| done | |
| for i in audacious.desktop; do \ | |
| ${INSTALL_STATUS}; \ | |
| - if ${MKDIR_P} ${DESTDIR}${datadir}/applications && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/applications/$$i; then \ | |
| - ${INSTALL_OK}; \ | |
| - else \ | |
| - ${INSTALL_FAILED}; \ | |
| - fi \ | |
| + ${MKDIR_P} ${DESTDIR}${datadir}/applications && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/applications/$$i; \ | |
| done | |
| if [ -f ${DESTDIR}${datadir}/audacious/Skins/Default/balance.png ]; then \ | |
| rm -f ${DESTDIR}${datadir}/audacious/Skins/Default/balance.png; \ | |
| @@ -28,19 +20,11 @@ install-extra: | |
| uninstall-extra: | |
| for i in audacious.pc audclient.pc; do \ | |
| if [ -f ${DESTDIR}${libdir}/pkgconfig/$$i ]; then \ | |
| - if rm -f ${DESTDIR}${libdir}/pkgconfig/$$i; then \ | |
| - ${DELETE_OK}; \ | |
| - else \ | |
| - ${DELETE_FAILED}; \ | |
| - fi \ | |
| + rm -f ${DESTDIR}${libdir}/pkgconfig/$$i; \ | |
| fi; \ | |
| done | |
| for i in audacious.desktop; do \ | |
| if test -f ${DESTDIR}${datadir}/applications/$$i; then \ | |
| - if rm -f ${DESTDIR}${datadir}/applications/$$i; then \ | |
| - ${DELETE_OK}; \ | |
| - else \ | |
| - ${DELETE_FAILED}; \ | |
| - fi \ | |
| + rm -f ${DESTDIR}${datadir}/applications/$$i; \ | |
| fi \ | |
| done | |
| diff --git a/buildsys.mk.in b/buildsys.mk.in | |
| index b00ae75..3588b92 100644 | |
| --- a/buildsys.mk.in | |
| +++ b/buildsys.mk.in | |
| @@ -100,7 +100,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o} | |
| MO_FILES = ${LOCALES:.po=.mo} | |
| -.SILENT: | |
| +#.SILENT: | |
| .SUFFIXES: | |
| .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o .java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm | |
| .PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales | |
| @@ -112,9 +112,9 @@ all: | |
| subdirs: | |
| for i in ${SUBDIRS}; do \ | |
| - ${DIR_ENTER}; \ | |
| + cd $$i; \ | |
| ${MAKE} ${MFLAGS} || exit 1; \ | |
| - ${DIR_LEAVE}; \ | |
| + cd ..; \ | |
| done | |
| depend: pre-depend ${SRCS} | |
| @@ -130,14 +130,14 @@ depend: pre-depend ${SRCS} | |
| esac; \ | |
| done; \ | |
| if test x"$$regen" = x"1" -a x"$$deps" != x""; then \ | |
| - ${DEPEND_STATUS}; \ | |
| + \ | |
| if ${MAKE} ${MFLAGS} $$deps && cat $$deps >.deps; then \ | |
| rm -f $$deps; \ | |
| - ${DEPEND_OK}; \ | |
| + \ | |
| else \ | |
| :> .deps; \ | |
| touch -t 0001010000 .deps; \ | |
| - ${DEPEND_FAILED}; \ | |
| + \ | |
| fi; \ | |
| fi | |
| @@ -149,48 +149,23 @@ depend: pre-depend ${SRCS} | |
| pre-depend: | |
| ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} | |
| - ${LINK_STATUS} | |
| - if ${LD} -o $@ ${OBJS} ${LDFLAGS} ${LIBS}; then \ | |
| - ${LINK_OK}; \ | |
| - else \ | |
| - ${LINK_FAILED}; \ | |
| - fi | |
| + ${LD} -o $@ ${OBJS} ${LDFLAGS} ${LIBS} | |
| ${JARFILE}: ${EXT_DEPS} ${JAR_MANIFEST} ${OBJS} | |
| - ${LINK_STATUS} | |
| if test x"${JAR_MANIFEST}" != x""; then \ | |
| - if ${JAR} cfm ${JARFILE} ${JAR_MANIFEST} ${OBJS}; then \ | |
| - ${LINK_OK}; \ | |
| - else \ | |
| - ${LINK_FAILED}; \ | |
| - fi \ | |
| + ${JAR} cfm ${JARFILE} ${JAR_MANIFEST} ${OBJS}; \ | |
| else \ | |
| - if ${JAR} cf ${JARFILE} ${OBJS}; then \ | |
| - ${LINK_OK}; \ | |
| - else \ | |
| - ${LINK_FAILED}; \ | |
| - fi \ | |
| + ${JAR} cf ${JARFILE} ${OBJS}; \ | |
| fi | |
| ${LIB} ${LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} | |
| - ${LINK_STATUS}; \ | |
| - if ${LD} -o $@ ${LIB_OBJS} ${LIB_LDFLAGS} ${LDFLAGS} ${LIBS}; then \ | |
| - ${LINK_OK}; \ | |
| - else \ | |
| - ${LINK_FAILED}; \ | |
| - fi \ | |
| + ${LD} -o $@ ${LIB_OBJS} ${LIB_LDFLAGS} ${LDFLAGS} ${LIBS}; | |
| ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS} | |
| - ${LINK_STATUS} | |
| - if ${LD} -o $@ ${PLUGIN_OBJS} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}; then \ | |
| - ${LINK_OK}; \ | |
| - else \ | |
| - ${LINK_FAILED}; \ | |
| - fi | |
| + ${LD} -o $@ ${PLUGIN_OBJS} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}; | |
| ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} | |
| - ${LINK_STATUS} | |
| - rm -f $@ | |
| + rm -f $@ | |
| objs=""; \ | |
| ars=""; \ | |
| for i in ${OBJS}; do \ | |
| @@ -214,10 +189,7 @@ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} | |
| done; \ | |
| cd ..; \ | |
| done; \ | |
| - if ${AR} cr $@ $$objs && ${RANLIB} $@; then \ | |
| - ${LINK_OK}; \ | |
| - else \ | |
| - ${LINK_FAILED}; \ | |
| + if test $$(${AR} cr $@ $$objs && ${RANLIB} $@) -ne 0; then \ | |
| rm -f $@; \ | |
| fi; \ | |
| for i in $$ars; do \ | |
| @@ -226,331 +198,147 @@ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} | |
| done | |
| ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} | |
| - ${LINK_STATUS} | |
| - if ${AR} cr $@ ${LIB_OBJS} && ${RANLIB} $@; then \ | |
| - ${LINK_OK}; \ | |
| - else \ | |
| - ${LINK_FAILED}; \ | |
| + if test $$(${AR} cr $@ ${LIB_OBJS} && ${RANLIB} $@) -ne 0; then \ | |
| rm -f $@; \ | |
| fi | |
| locales: ${MO_FILES} | |
| .c.o: | |
| - ${COMPILE_STATUS} | |
| - if ${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ | |
| - ${COMPILE_OK}; \ | |
| - else \ | |
| - ${COMPILE_FAILED}; \ | |
| - fi | |
| + ${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; | |
| .c.lib.o: | |
| - ${COMPILE_LIB_STATUS} | |
| - if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ | |
| - ${COMPILE_LIB_OK}; \ | |
| - else \ | |
| - ${COMPILE_LIB_FAILED}; \ | |
| - fi | |
| + ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; | |
| .c.plugin.o: | |
| - ${COMPILE_PLUGIN_STATUS} | |
| - if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ | |
| - ${COMPILE_PLUGIN_OK}; \ | |
| - else \ | |
| - ${COMPILE_PLUGIN_FAILED}; \ | |
| - fi | |
| + ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; | |
| .cc.o .cxx.o: | |
| - ${COMPILE_STATUS} | |
| - if ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ | |
| - ${COMPILE_OK}; \ | |
| - else \ | |
| - ${COMPILE_FAILED}; \ | |
| - fi | |
| + ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; | |
| .cc.lib.o .cxx.lib.o: | |
| - ${COMPILE_LIB_STATUS} | |
| - if ${CXX} ${LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ | |
| - ${COMPILE_LIB_OK}; \ | |
| - else \ | |
| - ${COMPILE_LIB_FAILED}; \ | |
| - fi | |
| + ${CXX} ${LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; | |
| .cc.plugin.o .cxx.plugin.o: | |
| - ${COMPILE_PLUGIN_STATUS} | |
| - if ${CXX} ${PLUGIN_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ | |
| - ${COMPILE_PLUGIN_OK}; \ | |
| - else \ | |
| - ${COMPILE_PLUGIN_FAILED}; \ | |
| - fi | |
| + ${CXX} ${PLUGIN_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; | |
| .d.o: | |
| - ${COMPILE_STATUS} | |
| if test x"$(basename ${DC})" = x"dmd"; then \ | |
| - if ${DC} ${DFLAGS} -c -of$@ $<; then \ | |
| - ${COMPILE_OK}; \ | |
| - else \ | |
| - ${COMPILE_FAILED}; \ | |
| - fi \ | |
| + ${DC} ${DFLAGS} -c -of$@ $<; \ | |
| else \ | |
| - if ${DC} ${DFLAGS} -c -o $@ $<; then \ | |
| - ${COMPILE_OK}; \ | |
| - else \ | |
| - ${COMPILE_FAILED}; \ | |
| - fi \ | |
| + ${DC} ${DFLAGS} -c -o $@ $<; \ | |
| fi | |
| .erl.beam: | |
| - ${COMPILE_STATUS} | |
| - if ${ERLC} ${ERLCFLAGS} -o $@ $<; then \ | |
| - ${COMPILE_OK}; \ | |
| - else \ | |
| - ${COMPILE_FAILED}; \ | |
| - fi | |
| + ${ERLC} ${ERLCFLAGS} -o $@ $<; | |
| .java.class: | |
| - ${COMPILE_STATUS} | |
| - if ${JAVAC} ${JAVACFLAGS} $<; then \ | |
| - ${COMPILE_OK}; \ | |
| - else \ | |
| - ${COMPILE_FAILED}; \ | |
| - fi | |
| + ${JAVAC} ${JAVACFLAGS} $<; | |
| .m.o: | |
| - ${COMPILE_STATUS} | |
| - if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ | |
| - ${COMPILE_OK}; \ | |
| - else \ | |
| - ${COMPILE_FAILED}; \ | |
| - fi | |
| + ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; | |
| .m.lib.o: | |
| - ${COMPILE_LIB_STATUS} | |
| - if ${OBJC} ${LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ | |
| - ${COMPILE_LIB_OK}; \ | |
| - else \ | |
| - ${COMPILE_LIB_FAILED}; \ | |
| - fi | |
| + ${OBJC} ${LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; | |
| .m.plugin.o: | |
| - ${COMPILE_PLUGIN_STATUS} | |
| - if ${OBJC} ${PLUGIN_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ | |
| - ${COMPILE_PLUGIN_OK}; \ | |
| - else \ | |
| - ${COMPILE_PLUGIN_FAILED}; \ | |
| - fi | |
| + ${OBJC} ${PLUGIN_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; | |
| .mm.o: | |
| - ${COMPILE_STATUS} | |
| - if ${OBJCXX} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ | |
| - ${COMPILE_OK}; \ | |
| - else \ | |
| - ${COMPILE_FAILED}; \ | |
| - fi | |
| + ${OBJCXX} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; | |
| .mm.lib.o: | |
| - ${COMPILE_LIB_STATUS} | |
| - if ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ | |
| - ${COMPILE_LIB_OK}; \ | |
| - else \ | |
| - ${COMPILE_LIB_FAILED}; \ | |
| - fi | |
| + ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; | |
| .mm.plugin.o: | |
| - ${COMPILE_PLUGIN_STATUS} | |
| - if ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ | |
| - ${COMPILE_PLUGIN_OK}; \ | |
| - else \ | |
| - ${COMPILE_PLUGIN_FAILED}; \ | |
| - fi | |
| + ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; | |
| .po.mo: | |
| - ${COMPILE_STATUS} | |
| - if ${MSGFMT} -c -o $@ $<; then \ | |
| - ${COMPILE_OK}; \ | |
| - else \ | |
| - ${COMPILE_FAILED}; \ | |
| - fi | |
| + ${MSGFMT} -c -o $@ $<; | |
| .py.pyc: | |
| - ${COMPILE_STATUS} | |
| - if ${PYTHON} ${PYTHON_FLAGS} -c "import py_compile; py_compile.compile('$<')"; then \ | |
| - ${COMPILE_OK}; \ | |
| - else \ | |
| - ${COMPILE_FAILED}; \ | |
| - fi | |
| + ${PYTHON} ${PYTHON_FLAGS} -c "import py_compile; py_compile.compile('$<')"; | |
| .rc.o .rc.lib.o .rc.plugin.o: | |
| - ${COMPILE_STATUS} | |
| - if ${WINDRES} -J rc -O coff -o $@ $<; then \ | |
| - ${COMPILE_OK}; \ | |
| - else \ | |
| - ${COMPILE_FAILED}; \ | |
| - fi | |
| + ${WINDRES} -J rc -O coff -o $@ $<; | |
| .S.o: | |
| - ${COMPILE_STATUS} | |
| - if ${AS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ | |
| - ${COMPILE_OK}; \ | |
| - else \ | |
| - ${COMPILE_FAILED}; \ | |
| - fi | |
| + ${AS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; | |
| .S.lib.o: | |
| - ${COMPILE_LIB_STATUS} | |
| - if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ | |
| - ${COMPILE_LIB_OK}; \ | |
| - else \ | |
| - ${COMPILE_LIB_FAILED}; \ | |
| - fi | |
| + ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; | |
| .S.plugin.o: | |
| - ${COMPILE_PLUGIN_STATUS} | |
| - if ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ | |
| - ${COMPILE_PLUGIN_OK}; \ | |
| - else \ | |
| - ${COMPILE_PLUGIN_FAILED}; \ | |
| - fi | |
| + ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; | |
| .xpm.o: | |
| - ${COMPILE_STATUS} | |
| - if ${CC} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \ | |
| - ${COMPILE_OK}; \ | |
| - else \ | |
| - ${COMPILE_FAILED}; \ | |
| - fi | |
| + ${CC} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; | |
| .xpm.lib.o: | |
| - ${COMPILE_LIB_STATUS} | |
| - if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \ | |
| - ${COMPILE_LIB_OK}; \ | |
| - else \ | |
| - ${COMPILE_LIB_FAILED}; \ | |
| - fi | |
| + ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; | |
| .xpm.plugin.o: | |
| - ${COMPILE_PLUGIN_STATUS} | |
| - if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \ | |
| - ${COMPILE_PLUGIN_OK}; \ | |
| - else \ | |
| - ${COMPILE_PLUGIN_FAILED}; \ | |
| - fi | |
| + ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; | |
| install: ${LIB} ${STATIC_LIB} ${STATIC_PIC_LIB} ${PLUGIN} ${PROG} install-extra | |
| for i in ${SUBDIRS}; do \ | |
| - ${DIR_ENTER}; \ | |
| + cd $$i; \ | |
| ${MAKE} ${MFLAGS} install || exit 1; \ | |
| - ${DIR_LEAVE}; \ | |
| + cd ..; \ | |
| done | |
| for i in ${LIB}; do \ | |
| - ${INSTALL_STATUS}; \ | |
| - if ${MKDIR_P} ${DESTDIR}${libdir} ${INSTALL_LIB}; then \ | |
| - ${INSTALL_OK}; \ | |
| - else \ | |
| - ${INSTALL_FAILED}; \ | |
| - fi \ | |
| + ${MKDIR_P} ${DESTDIR}${libdir} ${INSTALL_LIB}; \ | |
| done | |
| for i in ${STATIC_LIB} ${STATIC_PIC_LIB}; do \ | |
| - ${INSTALL_STATUS}; \ | |
| - if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/$$i; then \ | |
| - ${INSTALL_OK}; \ | |
| - else \ | |
| - ${INSTALL_FAILED}; \ | |
| - fi \ | |
| + ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/$$i; \ | |
| done | |
| for i in ${PLUGIN}; do \ | |
| - ${INSTALL_STATUS}; \ | |
| - if ${MKDIR_P} ${DESTDIR}${plugindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i; then \ | |
| - ${INSTALL_OK}; \ | |
| - else \ | |
| - ${INSTALL_FAILED}; \ | |
| - fi \ | |
| + ${MKDIR_P} ${DESTDIR}${plugindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i; \ | |
| done | |
| for i in ${DATA}; do \ | |
| - ${INSTALL_STATUS}; \ | |
| - if ${MKDIR_P} $$(dirname ${DESTDIR}${datadir}/${PACKAGE}/$$i) && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \ | |
| - ${INSTALL_OK}; \ | |
| - else \ | |
| - ${INSTALL_FAILED}; \ | |
| - fi \ | |
| + ${MKDIR_P} $$(dirname ${DESTDIR}${datadir}/${PACKAGE}/$$i) && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE}/$$i; \ | |
| done | |
| for i in ${PROG}; do \ | |
| - ${INSTALL_STATUS}; \ | |
| - if ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i; then \ | |
| - ${INSTALL_OK}; \ | |
| - else \ | |
| - ${INSTALL_FAILED}; \ | |
| - fi \ | |
| + ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i; \ | |
| done | |
| for i in ${INCLUDES}; do \ | |
| - ${INSTALL_STATUS}; \ | |
| - if ${MKDIR_P} ${DESTDIR}${includedir}/${includesubdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${includedir}/${includesubdir}/$$i; then \ | |
| - ${INSTALL_OK}; \ | |
| - else \ | |
| - ${INSTALL_FAILED}; \ | |
| - fi \ | |
| + ${MKDIR_P} ${DESTDIR}${includedir}/${includesubdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${includedir}/${includesubdir}/$$i; \ | |
| done | |
| if test x"${USE_NLS}" = x"yes"; then \ | |
| for i in ${MO_FILES}; do \ | |
| - ${INSTALL_STATUS}; \ | |
| - if ${MKDIR_P} ${DESTDIR}${localedir}/$${i%.mo}/LC_MESSAGES && ${INSTALL} -m 644 $$i ${DESTDIR}${localedir}/$${i%.mo}/LC_MESSAGES/${localename}.mo; then \ | |
| - ${INSTALL_OK}; \ | |
| - else \ | |
| - ${INSTALL_FAILED}; \ | |
| - fi \ | |
| + ${MKDIR_P} ${DESTDIR}${localedir}/$${i%.mo}/LC_MESSAGES && ${INSTALL} -m 644 $$i ${DESTDIR}${localedir}/$${i%.mo}/LC_MESSAGES/${localename}.mo; \ | |
| done \ | |
| fi | |
| for i in ${MAN}; do \ | |
| - ${INSTALL_STATUS}; \ | |
| - if ${MKDIR_P} ${DESTDIR}${mandir}/${mansubdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${mandir}/${mansubdir}/$$i; then \ | |
| - ${INSTALL_OK}; \ | |
| - else \ | |
| - ${INSTALL_FAILED}; \ | |
| - fi \ | |
| + ${MKDIR_P} ${DESTDIR}${mandir}/${mansubdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${mandir}/${mansubdir}/$$i; \ | |
| done | |
| install-extra: | |
| uninstall: uninstall-extra | |
| for i in ${SUBDIRS}; do \ | |
| - ${DIR_ENTER}; \ | |
| + cd $$i; \ | |
| ${MAKE} ${MFLAGS} uninstall || exit 1; \ | |
| - ${DIR_LEAVE}; \ | |
| + cd ..; \ | |
| done | |
| for i in ${LIB}; do \ | |
| if test -f ${DESTDIR}${libdir}/$$i; then \ | |
| - if : ${UNINSTALL_LIB}; then \ | |
| - ${DELETE_OK}; \ | |
| - else \ | |
| - ${DELETE_FAILED}; \ | |
| - fi \ | |
| + : ${UNINSTALL_LIB}; \ | |
| fi; \ | |
| done | |
| for i in ${STATIC_LIB} ${STATIC_PIC_LIB}; do \ | |
| if test -f ${DESTDIR}${libdir}/$$i; then \ | |
| - if rm -f ${DESTDIR}${libdir}/$$i; then \ | |
| - ${DELETE_OK}; \ | |
| - else \ | |
| - ${DELETE_FAILED}; \ | |
| - fi \ | |
| + rm -f ${DESTDIR}${libdir}/$$i; \ | |
| fi \ | |
| done | |
| for i in ${PLUGIN}; do \ | |
| if test -f ${DESTDIR}${plugindir}/$$i; then \ | |
| - if rm -f ${DESTDIR}${plugindir}/$$i; then \ | |
| - ${DELETE_OK}; \ | |
| - else \ | |
| - ${DELETE_FAILED}; \ | |
| - fi \ | |
| + rm -f ${DESTDIR}${plugindir}/$$i; \ | |
| fi \ | |
| done | |
| -rmdir ${DESTDIR}${plugindir} >/dev/null 2>&1 | |
| for i in ${DATA}; do \ | |
| if test -f ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \ | |
| - if rm -f ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \ | |
| - ${DELETE_OK}; \ | |
| - else \ | |
| - ${DELETE_FAILED}; \ | |
| - fi \ | |
| + rm -f ${DESTDIR}${datadir}/${PACKAGE}/$$i; \ | |
| fi; \ | |
| rmdir "$$(dirname ${DESTDIR}${datadir}/${PACKAGE}/$$i)" >/dev/null 2>&1 || true; \ | |
| done | |
| @@ -558,42 +346,26 @@ uninstall: uninstall-extra | |
| for i in ${PROG}; do \ | |
| if test -f ${DESTDIR}${bindir}/$$i; then \ | |
| - if rm -f ${DESTDIR}${bindir}/$$i; then \ | |
| - ${DELETE_OK}; \ | |
| - else \ | |
| - ${DELETE_FAILED}; \ | |
| - fi \ | |
| + rm -f ${DESTDIR}${bindir}/$$i; \ | |
| fi \ | |
| done | |
| for i in ${INCLUDES}; do \ | |
| if test -f ${DESTDIR}${includedir}/${includesubdir}/$$i; then \ | |
| - if rm -f ${DESTDIR}${includedir}/${includesubdir}/$$i; then \ | |
| - ${DELETE_OK}; \ | |
| - else \ | |
| - ${DELETE_FAILED}; \ | |
| - fi \ | |
| + rm -f ${DESTDIR}${includedir}/${includesubdir}/$$i; \ | |
| fi \ | |
| done | |
| -rmdir ${DESTDIR}${includedir}/${includesubdir} >/dev/null 2>&1 | |
| for i in ${MO_FILES}; do \ | |
| if test -f ${DESTDIR}${localedir}/$${i%.mo}/LC_MESSAGES/${localename}.mo; then \ | |
| - if rm -f ${DESTDIR}${localedir}/$${i%.mo}/LC_MESSAGES/${localename}.mo; then \ | |
| - ${DELETE_OK}; \ | |
| - else \ | |
| - ${DELETE_FAILED}; \ | |
| - fi \ | |
| + rm -f ${DESTDIR}${localedir}/$${i%.mo}/LC_MESSAGES/${localename}.mo; \ | |
| fi \ | |
| done | |
| for i in ${MAN}; do \ | |
| if test -f ${DESTDIR}${mandir}/${mansubdir}/$$i; then \ | |
| - if rm -f ${DESTDIR}${mandir}/${mansubdir}/$$i; then \ | |
| - ${DELETE_OK}; \ | |
| - else \ | |
| - ${DELETE_FAILED}; \ | |
| - fi \ | |
| + rm -f ${DESTDIR}${mandir}/${mansubdir}/$$i; \ | |
| fi \ | |
| done | |
| @@ -601,59 +373,51 @@ uninstall-extra: | |
| clean: | |
| for i in ${SUBDIRS}; do \ | |
| - ${DIR_ENTER}; \ | |
| + cd $$i; \ | |
| ${MAKE} ${MFLAGS} clean || exit 1; \ | |
| - ${DIR_LEAVE}; \ | |
| + cd ..; \ | |
| done | |
| for i in ${DEPS} ${OBJS} ${LIB_OBJS} ${PLUGIN_OBJS} ${PROG} ${PROG_NOINST} ${LIB} ${LIB_NOINST} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${CLEAN_LIB} ${MO_FILES} ${CLEAN}; do \ | |
| if test -f $$i -o -d $$i; then \ | |
| - if rm -fr $$i; then \ | |
| - ${DELETE_OK}; \ | |
| - else \ | |
| - ${DELETE_FAILED}; \ | |
| - fi \ | |
| + rm -fr $$i; \ | |
| fi \ | |
| done | |
| distclean: clean | |
| for i in ${SUBDIRS}; do \ | |
| - ${DIR_ENTER}; \ | |
| + cd $$i; \ | |
| ${MAKE} ${MFLAGS} distclean || exit 1; \ | |
| - ${DIR_LEAVE}; \ | |
| + cd ..; \ | |
| done | |
| for i in ${DISTCLEAN} .deps *~; do \ | |
| if test -f $$i -o -d $$i; then \ | |
| - if rm -fr $$i; then \ | |
| - ${DELETE_OK}; \ | |
| - else \ | |
| - ${DELETE_FAILED}; \ | |
| - fi \ | |
| + rm -fr $$i; \ | |
| fi \ | |
| done | |
| -DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd $$i || exit 1 | |
| +#DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd $$i || exit 1 | |
| DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd .. || exit 1 | |
| -DEPEND_STATUS = printf "@TERM_EL@@TERM_SETAF3@Generating dependencies...@TERM_SGR0@\r" | |
| -DEPEND_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully generated dependencies.@TERM_SGR0@\n" | |
| -DEPEND_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to generate dependencies!@TERM_SGR0@\n"; exit 1 | |
| -COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" | |
| -COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" | |
| -COMPILE_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit 1 | |
| -COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r" | |
| -COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n" | |
| -COMPILE_LIB_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n"; exit 1 | |
| -COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r" | |
| -COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n" | |
| -COMPILE_PLUGIN_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n"; exit 1 | |
| -LINK_STATUS = printf "@TERM_EL@@TERM_SETAF3@Linking @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" | |
| -LINK_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully linked @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" | |
| -LINK_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to link @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit 1 | |
| -INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3@Installing @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" | |
| -INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully installed @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" | |
| -INSTALL_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit 1 | |
| -DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n" | |
| -DELETE_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit 1 | |
| +#DEPEND_STATUS = printf "@TERM_EL@@TERM_SETAF3@Generating dependencies...@TERM_SGR0@\r" | |
| +#DEPEND_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully generated dependencies.@TERM_SGR0@\n" | |
| +#DEPEND_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to generate dependencies!@TERM_SGR0@\n"; exit 1 | |
| +#COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" | |
| +#COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" | |
| +#COMPILE_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit 1 | |
| +#COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r" | |
| +#COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n" | |
| +#COMPILE_LIB_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n"; exit 1 | |
| +#COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r" | |
| +#COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n" | |
| +#COMPILE_PLUGIN_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n"; exit 1 | |
| +#LINK_STATUS = printf "@TERM_EL@@TERM_SETAF3@Linking @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" | |
| +#LINK_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully linked @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" | |
| +#LINK_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to link @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit 1 | |
| +#INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3@Installing @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" | |
| +#INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully installed @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" | |
| +#INSTALL_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit 1 | |
| +#DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n" | |
| +#DELETE_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit 1 | |
| include .deps |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment