From d46d12a35546e363487724fdab4a43f5a2dee975 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 14 Dec 2014 18:13:15 +0100 Subject: [PATCH] Re-generated the Makefiles --- Makefile | 10 +++++----- src/Makefile | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index f4e6abf..e1aadec 100644 --- a/Makefile +++ b/Makefile @@ -25,9 +25,9 @@ distclean: @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) distclean) || exit; done dist: - $(RM) -r -- $(PACKAGE)-$(VERSION) - $(LN) -s -- . $(PACKAGE)-$(VERSION) - @$(TAR) -czvf $(OBJDIR)$(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)/data/Makefile \ $(PACKAGE)-$(VERSION)/data/libSystem.pc.in \ $(PACKAGE)-$(VERSION)/data/pkgconfig.sh \ @@ -119,10 +119,10 @@ dist: $(PACKAGE)-$(VERSION)/config.sh \ $(PACKAGE)-$(VERSION)/README.md \ $(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/") diff --git a/src/Makefile b/src/Makefile index 0cec840..63898eb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -22,7 +22,7 @@ all: $(TARGETS) libSystem_OBJS = $(OBJDIR)array.o $(OBJDIR)buffer.o $(OBJDIR)config.o $(OBJDIR)error.o $(OBJDIR)event.o $(OBJDIR)hash.o $(OBJDIR)mutator.o $(OBJDIR)object.o $(OBJDIR)parser.o $(OBJDIR)plugin.o $(OBJDIR)string.o $(OBJDIR)token.o $(OBJDIR)variable.o libSystem_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) -libSystem_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) +libSystem_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) $(OBJDIR)libSystem.a: $(libSystem_OBJS) $(AR) -rc $(OBJDIR)libSystem.a $(libSystem_OBJS)