configury: do not define "dummy" empty targets any more.
We previously needed to have empty targets because AM couldn't handle having an AM_CONDITIONAL was targets in the "if" statement but not in the "else". :-( That now appears as an old automake bug that has been fixed, so cleanup some Makefile.am Thanks Jeff for the pointer. Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
Этот коммит содержится в:
родитель
d2393251f7
Коммит
6e04b2a66a
@ -852,13 +852,5 @@ uninstall-local:
|
|||||||
echo rm -f $(DESTDIR)$(libdir)/$$file; \
|
echo rm -f $(DESTDIR)$(libdir)/$$file; \
|
||||||
rm -f $(DESTDIR)$(libdir)/$$file; \
|
rm -f $(DESTDIR)$(libdir)/$$file; \
|
||||||
done
|
done
|
||||||
else
|
|
||||||
|
|
||||||
# Need to have empty targets because AM can't handle having an
|
|
||||||
# AM_CONDITIONAL was targets in the "if" statement but not in the
|
|
||||||
# "else". :-(
|
|
||||||
|
|
||||||
install-exec-hook:
|
|
||||||
uninstall-local:
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
# Copyright (c) 2012-2013 Inria. All rights reserved.
|
# Copyright (c) 2012-2013 Inria. All rights reserved.
|
||||||
# Copyright (c) 2013 Los Alamos National Security, LLC. All rights
|
# Copyright (c) 2013 Los Alamos National Security, LLC. All rights
|
||||||
# reserved.
|
# reserved.
|
||||||
# Copyright (c) 2015-2016 Research Organization for Information Science
|
# Copyright (c) 2015-2018 Research Organization for Information Science
|
||||||
# and Technology (RIST). All rights reserved.
|
# and Technology (RIST). All rights reserved.
|
||||||
# Copyright (c) 2016 IBM Corporation. All rights reserved.
|
# Copyright (c) 2016 IBM Corporation. All rights reserved.
|
||||||
#
|
#
|
||||||
@ -90,13 +90,5 @@ uninstall-local:
|
|||||||
echo rm -f $(DESTDIR)$(libdir)/$$file; \
|
echo rm -f $(DESTDIR)$(libdir)/$$file; \
|
||||||
rm -f $(DESTDIR)$(libdir)/$$file; \
|
rm -f $(DESTDIR)$(libdir)/$$file; \
|
||||||
done
|
done
|
||||||
else
|
|
||||||
|
|
||||||
# Need to have empty targets because AM can't handle having an
|
|
||||||
# AM_CONDITIONAL was targets in the "if" statement but not in the
|
|
||||||
# "else". :-(
|
|
||||||
|
|
||||||
install-exec-hook:
|
|
||||||
uninstall-local:
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# -*- makefile -*-
|
# -*- makefile -*-
|
||||||
#
|
#
|
||||||
# Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
|
# Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
|
||||||
# Copyright (c) 2015 Research Organization for Information Science
|
# Copyright (c) 2015-2018 Research Organization for Information Science
|
||||||
# and Technology (RIST). All rights reserved.
|
# and Technology (RIST). All rights reserved.
|
||||||
# Copyright (c) 2016 IBM Corporation. All rights reserved.
|
# Copyright (c) 2016 IBM Corporation. All rights reserved.
|
||||||
#
|
#
|
||||||
@ -111,13 +111,5 @@ uninstall-local:
|
|||||||
echo rm -f $(DESTDIR)$(libdir)/$$file; \
|
echo rm -f $(DESTDIR)$(libdir)/$$file; \
|
||||||
rm -f $(DESTDIR)$(libdir)/$$file; \
|
rm -f $(DESTDIR)$(libdir)/$$file; \
|
||||||
done
|
done
|
||||||
else
|
|
||||||
|
|
||||||
# Need to have empty targets because AM can't handle having an
|
|
||||||
# AM_CONDITIONAL was targets in the "if" statement but not in the
|
|
||||||
# "else". :-(
|
|
||||||
|
|
||||||
install-exec-hook:
|
|
||||||
uninstall-local:
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user