From bf01ac0e02e5b9b6a3740530d13f4c8e9bc4f4d5 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Thu, 28 Dec 2017 01:39:01 +0100 Subject: [PATCH] Re-generate the Makefiles --- Makefile | 2 +- data/Makefile | 2 +- doc/Makefile | 2 +- doc/gtkdoc/Makefile | 2 +- doc/gtkdoc/tmpl/Makefile | 2 +- include/Makefile | 2 +- include/System/Makefile | 2 +- src/Makefile | 2 +- tests/Makefile | 2 +- tools/Makefile | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 1bdab0e..829592c 100644 --- a/Makefile +++ b/Makefile @@ -151,7 +151,7 @@ distcheck: dist cd "$(PACKAGE)-$(VERSION)" && $(MAKE) dist $(RM) -r -- $(PACKAGE)-$(VERSION) -install: +install: all @for i in $(SUBDIRS); do (cd "$$i" && \ if [ -n "$(OBJDIR)" ]; then \ $(MAKE) OBJDIR="$(OBJDIR)$$i/" install; \ diff --git a/data/Makefile b/data/Makefile index a9704d3..104287e 100644 --- a/data/Makefile +++ b/data/Makefile @@ -20,7 +20,7 @@ clean: distclean: clean $(RM) -- $(TARGETS) -install: $(TARGETS) +install: all ./pkgconfig.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)libSystem.pc" uninstall: diff --git a/doc/Makefile b/doc/Makefile index 46a0d5d..0a96c86 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -68,7 +68,7 @@ distclean: ./gtkdoc.sh -c -P "$(PREFIX)" -- "$(OBJDIR)gtkdoc/html.stamp" $(RM) -- $(TARGETS) -install: $(TARGETS) +install: all @for i in $(SUBDIRS); do (cd "$$i" && \ if [ -n "$(OBJDIR)" ]; then \ $(MAKE) OBJDIR="$(OBJDIR)$$i/" install; \ diff --git a/doc/gtkdoc/Makefile b/doc/gtkdoc/Makefile index 71c246f..78aaa1f 100644 --- a/doc/gtkdoc/Makefile +++ b/doc/gtkdoc/Makefile @@ -23,7 +23,7 @@ distclean: $(MAKE) OBJDIR="$(OBJDIR)$$i/" distclean; \ else $(MAKE) distclean; fi) || exit; done -install: +install: all @for i in $(SUBDIRS); do (cd "$$i" && \ if [ -n "$(OBJDIR)" ]; then \ $(MAKE) OBJDIR="$(OBJDIR)$$i/" install; \ diff --git a/doc/gtkdoc/tmpl/Makefile b/doc/gtkdoc/tmpl/Makefile index be735a4..7ae6224 100644 --- a/doc/gtkdoc/tmpl/Makefile +++ b/doc/gtkdoc/tmpl/Makefile @@ -6,7 +6,7 @@ clean: distclean: clean -install: +install: all uninstall: diff --git a/include/Makefile b/include/Makefile index 37e991a..1a9ae02 100644 --- a/include/Makefile +++ b/include/Makefile @@ -30,7 +30,7 @@ distclean: $(MAKE) OBJDIR="$(OBJDIR)$$i/" distclean; \ else $(MAKE) distclean; fi) || exit; done -install: +install: all @for i in $(SUBDIRS); do (cd "$$i" && \ if [ -n "$(OBJDIR)" ]; then \ $(MAKE) OBJDIR="$(OBJDIR)$$i/" install; \ diff --git a/include/System/Makefile b/include/System/Makefile index 060942b..4c1584a 100644 --- a/include/System/Makefile +++ b/include/System/Makefile @@ -14,7 +14,7 @@ clean: distclean: clean -install: +install: all $(MKDIR) $(DESTDIR)$(INCLUDEDIR)/System $(INSTALL) -m 0644 array.h $(DESTDIR)$(INCLUDEDIR)/System/array.h $(MKDIR) $(DESTDIR)$(INCLUDEDIR)/System diff --git a/src/Makefile b/src/Makefile index 4d3282e..3cf21f3 100644 --- a/src/Makefile +++ b/src/Makefile @@ -85,7 +85,7 @@ clean: distclean: clean $(RM) -- $(TARGETS) -install: $(TARGETS) +install: all $(MKDIR) $(DESTDIR)$(LIBDIR) $(INSTALL) -m 0644 $(OBJDIR)libSystem.a $(DESTDIR)$(LIBDIR)/libSystem.a $(INSTALL) -m 0755 $(OBJDIR)libSystem$(SOEXT).0.0 $(DESTDIR)$(LIBDIR)/libSystem$(SOEXT).0.0 diff --git a/tests/Makefile b/tests/Makefile index 453c9c5..23ed7f5 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -108,7 +108,7 @@ clean: distclean: clean $(RM) -- $(TARGETS) -install: $(TARGETS) +install: all uninstall: diff --git a/tools/Makefile b/tools/Makefile index e42d607..b75f26e 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -36,7 +36,7 @@ clean: distclean: clean $(RM) -- $(TARGETS) -install: $(TARGETS) +install: all $(MKDIR) $(DESTDIR)$(BINDIR) $(INSTALL) -m 0755 $(OBJDIR)configctl$(EXEEXT) $(DESTDIR)$(BINDIR)/configctl$(EXEEXT)