Re-generate the Makefiles

This commit is contained in:
Pierre Pronchery 2017-11-18 05:20:52 +01:00
parent e1c19debe7
commit 358b014f59
2 changed files with 30 additions and 16 deletions

View File

@ -4,6 +4,7 @@ SUBDIRS = src
RM = rm -f RM = rm -f
LN = ln -f LN = ln -f
TAR = tar TAR = tar
TGZEXT = .tar.gz
MKDIR = mkdir -m 0755 -p MKDIR = mkdir -m 0755 -p
@ -17,15 +18,21 @@ subdirs:
else $(MAKE); fi) || exit; done else $(MAKE); fi) || exit; done
clean: clean:
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) clean) || exit; done @for i in $(SUBDIRS); do (cd "$$i" && \
if [ -n "$(OBJDIR)" ]; then \
$(MAKE) OBJDIR="$(OBJDIR)$$i/" clean; \
else $(MAKE) clean; fi) || exit; done
distclean: distclean:
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) distclean) || exit; done @for i in $(SUBDIRS); do (cd "$$i" && \
if [ -n "$(OBJDIR)" ]; then \
$(MAKE) OBJDIR="$(OBJDIR)$$i/" distclean; \
else $(MAKE) distclean; fi) || exit; done
dist: dist:
$(RM) -r -- $(OBJDIR)$(PACKAGE)-$(VERSION) $(RM) -r -- $(OBJDIR)$(PACKAGE)-$(VERSION)
$(LN) -s -- "$$PWD" $(OBJDIR)$(PACKAGE)-$(VERSION) $(LN) -s -- "$$PWD" $(OBJDIR)$(PACKAGE)-$(VERSION)
@cd $(OBJDIR). && $(TAR) -czvf $(OBJDIR)$(PACKAGE)-$(VERSION).tar.gz -- \ @cd $(OBJDIR). && $(TAR) -czvf $(PACKAGE)-$(VERSION)$(TGZEXT) -- \
$(PACKAGE)-$(VERSION)/src/platform/freebsd.c \ $(PACKAGE)-$(VERSION)/src/platform/freebsd.c \
$(PACKAGE)-$(VERSION)/src/platform/linux.c \ $(PACKAGE)-$(VERSION)/src/platform/linux.c \
$(PACKAGE)-$(VERSION)/src/platform/netbsd.c \ $(PACKAGE)-$(VERSION)/src/platform/netbsd.c \
@ -45,20 +52,26 @@ dist:
$(RM) -- $(OBJDIR)$(PACKAGE)-$(VERSION) $(RM) -- $(OBJDIR)$(PACKAGE)-$(VERSION)
distcheck: dist distcheck: dist
$(TAR) -xzvf $(OBJDIR)$(PACKAGE)-$(VERSION).tar.gz $(TAR) -xzvf $(OBJDIR)$(PACKAGE)-$(VERSION)$(TGZEXT)
$(MKDIR) -- $(PACKAGE)-$(VERSION)/objdir $(MKDIR) -- $(PACKAGE)-$(VERSION)/objdir
$(MKDIR) -- $(PACKAGE)-$(VERSION)/destdir $(MKDIR) -- $(PACKAGE)-$(VERSION)/destdir
(cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/") cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/"
(cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/" DESTDIR="$$PWD/destdir" install) cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/" DESTDIR="$$PWD/destdir" install
(cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/" DESTDIR="$$PWD/destdir" uninstall) cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/" DESTDIR="$$PWD/destdir" uninstall
(cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/" distclean) cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/" distclean
(cd "$(PACKAGE)-$(VERSION)" && $(MAKE) dist) cd "$(PACKAGE)-$(VERSION)" && $(MAKE) dist
$(RM) -r -- $(PACKAGE)-$(VERSION) $(RM) -r -- $(PACKAGE)-$(VERSION)
install: install:
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) install) || exit; done @for i in $(SUBDIRS); do (cd "$$i" && \
if [ -n "$(OBJDIR)" ]; then \
$(MAKE) OBJDIR="$(OBJDIR)$$i/" install; \
else $(MAKE) install; fi) || exit; done
uninstall: uninstall:
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) uninstall) || exit; done @for i in $(SUBDIRS); do (cd "$$i" && \
if [ -n "$(OBJDIR)" ]; then \
$(MAKE) OBJDIR="$(OBJDIR)$$i/" uninstall; \
else $(MAKE) uninstall; fi) || exit; done
.PHONY: all subdirs clean distclean dist distcheck install uninstall .PHONY: all subdirs clean distclean dist distcheck install uninstall

View File

@ -1,4 +1,4 @@
TARGETS = $(OBJDIR)strace TARGETS = $(OBJDIR)strace$(EXEEXT)
OBJDIR = OBJDIR =
PREFIX = /usr/local PREFIX = /usr/local
DESTDIR = DESTDIR =
@ -9,6 +9,7 @@ CPPFLAGSF=
CPPFLAGS= CPPFLAGS=
CFLAGSF = -W CFLAGSF = -W
CFLAGS = -Wall -g -O2 -pedantic CFLAGS = -Wall -g -O2 -pedantic
EXEEXT =
RM = rm -f RM = rm -f
LN = ln -f LN = ln -f
MKDIR = mkdir -m 0755 -p MKDIR = mkdir -m 0755 -p
@ -21,8 +22,8 @@ strace_OBJS = $(OBJDIR)platform/freebsd.o $(OBJDIR)platform/linux.o $(OBJDIR)pla
strace_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) strace_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
strace_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) strace_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
$(OBJDIR)strace: $(strace_OBJS) $(OBJDIR)strace$(EXEEXT): $(strace_OBJS)
$(CC) -o $(OBJDIR)strace $(strace_OBJS) $(strace_LDFLAGS) $(CC) -o $(OBJDIR)strace$(EXEEXT) $(strace_OBJS) $(strace_LDFLAGS)
$(OBJDIR)platform/freebsd.o: platform/freebsd.c platform/freebsd.h platform.h $(OBJDIR)platform/freebsd.o: platform/freebsd.c platform/freebsd.h platform.h
@[ -d "$(OBJDIR)platform" ] || $(MKDIR) -- "$(OBJDIR)platform" @[ -d "$(OBJDIR)platform" ] || $(MKDIR) -- "$(OBJDIR)platform"
@ -50,9 +51,9 @@ distclean: clean
install: $(TARGETS) install: $(TARGETS)
$(MKDIR) $(DESTDIR)$(BINDIR) $(MKDIR) $(DESTDIR)$(BINDIR)
$(INSTALL) -m 0755 $(OBJDIR)strace $(DESTDIR)$(BINDIR)/strace $(INSTALL) -m 0755 $(OBJDIR)strace$(EXEEXT) $(DESTDIR)$(BINDIR)/strace$(EXEEXT)
uninstall: uninstall:
$(RM) -- $(DESTDIR)$(BINDIR)/strace $(RM) -- $(DESTDIR)$(BINDIR)/strace$(EXEEXT)
.PHONY: all clean distclean install uninstall .PHONY: all clean distclean install uninstall