Merge pull request #4 from ska80/refactor-makefiles

Refactor makefiles
This commit is contained in:
Edwin Brady 2020-05-19 16:23:06 +01:00 committed by GitHub
commit 8380a6fa9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 16 deletions

View File

@ -28,8 +28,7 @@ export IDRIS2_VERSION := ${MAJOR}.${MINOR}.${PATCH}
IDRIS2_VERSION_TAG := ${IDRIS2_VERSION}${VER_TAG}
export SCHEME
export IDRIS2_CURDIR = $(CURDIR)
export IDRIS2_BOOT_PATH = ${IDRIS2_CURDIR}/libs/prelude/build/ttc:${IDRIS2_CURDIR}/libs/base/build/ttc:${IDRIS2_CURDIR}/libs/network/build/ttc
export IDRIS2_BOOT_PATH = ${CURDIR}/libs/prelude/build/ttc:${CURDIR}/libs/base/build/ttc:${CURDIR}/libs/network/build/ttc
.PHONY: all support clean support-clean bootstrap init-bootstrap idris2-exec ${TARGET}
@ -73,8 +72,8 @@ clean-libs:
${MAKE} -C libs/contrib clean
clean: clean-libs support-clean
${IDRIS2_BOOT} --clean idris2.ipkg
rm -rf ${TARGETDIR}
-${IDRIS2_BOOT} --clean idris2.ipkg
$(RM) -r build
install: install-idris2 install-support install-libs

View File

@ -10,7 +10,7 @@ CC := clang
RANLIB ?= ranlib
AR ?= ar
CFLAGS := -Wall $(CFLAGS) $(OPT)
CFLAGS := -Wall $(CFLAGS)
LDFLAGS := $(LDFLAGS)
MACHINE := $(shell $(CC) -dumpmachine)

View File

@ -5,4 +5,4 @@ install:
${IDRIS2} --install base.ipkg
clean:
rm -rf build
$(RM) -r build

View File

@ -5,4 +5,4 @@ install:
${IDRIS2} --install contrib.ipkg
clean:
rm -rf build
$(RM) -r build

View File

@ -1,4 +1,4 @@
include $(IDRIS2_CURDIR)/config.mk
include ../../config.mk
INSTALLDIR = `${IDRIS2} --libdir`/network/lib
@ -36,11 +36,11 @@ $(TARGET)$(SHLIB_SUFFIX): $(OBJS)
.PHONY: clean
clean :
rm -f $(OBJS) $(TARGET)$(SHLIB_SUFFIX)
rm -rf build
$(RM) $(OBJS) $(TARGET)$(SHLIB_SUFFIX)
$(RM) -r build
cleandep: clean
rm -f $(DEPS)
$(RM) $(DEPS)
.PHONY: install
@ -55,4 +55,4 @@ install:
test: build test.c
$(CC) -o network-tests -L. -I. test.c $(TARGET)$(SHLIB_SUFFIX)
LD_LIBRARY_PATH=. ./network-tests
@rm -f ./network-tests test.o
@$(RM) ./network-tests test.o

View File

@ -5,4 +5,4 @@ install:
${IDRIS2} --install prelude.ipkg
clean:
rm -rf build
$(RM) -r build

View File

@ -1,4 +1,4 @@
include $(IDRIS2_CURDIR)/config.mk
include ../../config.mk
TARGET = libidris2_support
@ -38,10 +38,10 @@ $(DYLIBTARGET): $(OBJS)
.PHONY: clean
clean:
rm -f $(OBJS) $(DYLIBTARGET) $(LIBTARGET)
$(RM) $(OBJS) $(DYLIBTARGET) $(LIBTARGET)
cleandep: clean
rm -f $(DEPS)
$(RM) $(DEPS)
.PHONY: install