diff options
Diffstat (limited to 'debian/cdbs/1/class/autotools.mk')
| -rw-r--r-- | debian/cdbs/1/class/autotools.mk | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/debian/cdbs/1/class/autotools.mk b/debian/cdbs/1/class/autotools.mk index bcff6e4..98850d7 100644 --- a/debian/cdbs/1/class/autotools.mk +++ b/debian/cdbs/1/class/autotools.mk @@ -28,32 +28,28 @@ _cdbs_class_autotools = 1 include debian/cdbs/1/class/autotools-vars.mk include $(_cdbs_class_path)/autotools-files.mk$(_cdbs_makefile_suffix) -cdbs_autotools_configure_stamps = $(if $(DEB_MAKE_FLAVORS),$(cdbs_make_builddir_check)$(patsubst %,debian/stamp-autotools-configure/%,$(DEB_MAKE_FLAVORS)),debian/stamp-autotools-configure) +cdbs_configure_stamps = $(if $(cdbs_make_multibuilds),$(cdbs_make_builddir_check)$(patsubst %,debian/stamp-autotools/%,$(cdbs_make_multibuilds)),debian/stamp-autotools) # Overriden from makefile-vars.mk. We pass CFLAGS and friends to ./configure, so # no need to pass them to make. DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(MAKE) -C $(cdbs_make_curbuilddir) pre-build:: - $(if $(DEB_MAKE_FLAVORS),mkdir -p debian/stamp-autotools-configure) + $(if $(cdbs_make_multibuilds),mkdir -p debian/stamp-autotools) common-configure-arch common-configure-indep:: common-configure-impl -common-configure-impl:: $(cdbs_autotools_configure_stamps) -$(cdbs_autotools_configure_stamps): +common-configure-impl:: $(cdbs_configure_stamps) +$(cdbs_configure_stamps): chmod a+x $(DEB_CONFIGURE_SCRIPT) - mkdir -p $(cdbs_make_curbuilddir) - $(DEB_CONFIGURE_INVOKE) $(cdbs_autotools_flags) $(DEB_CONFIGURE_EXTRA_FLAGS) $(DEB_CONFIGURE_USER_FLAGS) + $(if $(call cdbs_streq,$(cdbs_make_curbuilddir),$(DEB_BUILDDIR_$(cdbs_curpkg))),,mkdir -p $(cdbs_make_curbuilddir)) + $(DEB_CONFIGURE_INVOKE) $(cdbs_configure_flags) $(DEB_CONFIGURE_EXTRA_FLAGS) $(DEB_CONFIGURE_USER_FLAGS) $(if $(filter post,$(DEB_AUTO_UPDATE_LIBTOOL)),if [ -e $(cdbs_make_curbuilddir)/libtool ]; then cp -f /usr/bin/libtool $(cdbs_make_curbuilddir)/libtool; fi) touch $@ -cleanbuilddir:: $(patsubst %,cleanbuilddir/%,$(DEB_MAKE_FLAVORS)) - rm -rf debian/stamp-autotools-configure - -DEB_PHONY_RULES += $(patsubst %,cleanbuilddir/%,$(DEB_MAKE_FLAVORS)) -$(patsubst %,cleanbuilddir/%,$(DEB_MAKE_FLAVORS)):: - -rmdir $(cdbs_make_curbuilddir) -# FIXME: Avoid force-removing! -# -rm -rf $(cdbs_make_curbuilddir) - rm -f debian/stamp-autotools-configure/$(cdbs_make_curflavor) +makefile-clean:: + $(if $(cdbs_make_multibuilds),-rmdir --ignore-fail-on-non-empty debian/stamp-autotools,rm -f debian/stamp-autotools) +$(cdbs_make_clean_nonstamps):: + $(if $(call cdbs_streq,$(cdbs_make_curbuilddir),$(DEB_BUILDDIR_$(cdbs_curpkg))),,-rmdir --ignore-fail-on-non-empty $(cdbs_make_curbuilddir)) + $(if $(cdbs_make_multibuilds),rm -f $(@:makefile-clean%=debian/stamp-autotools%)) endif |