Re-generated the Makefiles

This commit is contained in:
Pierre Pronchery 2015-02-06 02:06:39 +01:00
parent a0803a4564
commit 8a6b9e0a71
2 changed files with 13 additions and 6 deletions

View File

@ -10,7 +10,11 @@ MKDIR = mkdir -m 0755 -p
all: subdirs
subdirs:
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE)) || exit; done
@for i in $(SUBDIRS); do (cd "$$i" && \
if [ -n "$(OBJDIR)" ]; then \
([ -d "$(OBJDIR)$$i" ] || $(MKDIR) -- "$(OBJDIR)$$i") && \
$(MAKE) OBJDIR="$(OBJDIR)$$i/"; \
else $(MAKE); fi) || exit; done
clean:
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) clean) || exit; done
@ -19,9 +23,9 @@ distclean:
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) distclean) || exit; done
dist:
$(RM) -r -- $(PACKAGE)-$(VERSION)
$(LN) -s -- . $(PACKAGE)-$(VERSION)
@$(TAR) -czvf $(PACKAGE)-$(VERSION).tar.gz -- \
$(RM) -r -- $(OBJDIR)$(PACKAGE)-$(VERSION)
$(LN) -s -- "$$PWD" $(OBJDIR)$(PACKAGE)-$(VERSION)
@cd $(OBJDIR). && $(TAR) -czvf $(OBJDIR)$(PACKAGE)-$(VERSION).tar.gz -- \
$(PACKAGE)-$(VERSION)/src/platform/freebsd.c \
$(PACKAGE)-$(VERSION)/src/platform/linux.c \
$(PACKAGE)-$(VERSION)/src/platform/netbsd.c \
@ -38,10 +42,10 @@ dist:
$(PACKAGE)-$(VERSION)/COPYING \
$(PACKAGE)-$(VERSION)/config.h \
$(PACKAGE)-$(VERSION)/project.conf
$(RM) -- $(PACKAGE)-$(VERSION)
$(RM) -- $(OBJDIR)$(PACKAGE)-$(VERSION)
distcheck: dist
$(TAR) -xzvf $(PACKAGE)-$(VERSION).tar.gz
$(TAR) -xzvf $(OBJDIR)$(PACKAGE)-$(VERSION).tar.gz
$(MKDIR) -- $(PACKAGE)-$(VERSION)/objdir
$(MKDIR) -- $(PACKAGE)-$(VERSION)/destdir
(cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/")

View File

@ -25,12 +25,15 @@ $(OBJDIR)strace: $(strace_OBJS)
$(CC) -o $(OBJDIR)strace $(strace_OBJS) $(strace_LDFLAGS)
$(OBJDIR)platform/freebsd.o: platform/freebsd.c platform/freebsd.h platform.h
@[ -d "$(OBJDIR)platform" ] || $(MKDIR) -- "$(OBJDIR)platform"
$(CC) $(strace_CFLAGS) -o $(OBJDIR)platform/freebsd.o -c platform/freebsd.c
$(OBJDIR)platform/linux.o: platform/linux.c platform/linux.h platform.h
@[ -d "$(OBJDIR)platform" ] || $(MKDIR) -- "$(OBJDIR)platform"
$(CC) $(strace_CFLAGS) -o $(OBJDIR)platform/linux.o -c platform/linux.c
$(OBJDIR)platform/netbsd.o: platform/netbsd.c platform/netbsd.h platform.h
@[ -d "$(OBJDIR)platform" ] || $(MKDIR) -- "$(OBJDIR)platform"
$(CC) $(strace_CFLAGS) -o $(OBJDIR)platform/netbsd.o -c platform/netbsd.c
$(OBJDIR)strace.o: strace.c platform.h strace.h ../config.h