get make clean to work for cext

Author: timfel

graalpython/com.oracle.graal.python.cext/Makefile

@@ -36,54 +36,49 @@
 # SOFTWARE.
 
 QUIETLY$(MX_VERBOSE) = @
-LIBDIR=${VPATH}/../lib-graalpython
+LIBDIR=../lib-graalpython
 TARGET_LIB=${LIBDIR}/capi.bc
 
 
-SOURCE_FILES=$(wildcard ${VPATH}/src/*.c)
+SOURCE_FILES=$(wildcard src/*.c)
 OBJ_FILES=${SOURCE_FILES:%.c=%.o}
-INCLUDE_FILES=$(wildcard ${VPATH}/include/*.h)
+INCLUDE_FILES=$(wildcard include/*.h)
 
-MODULE_SOURCES=$(wildcard ${VPATH}/modules/*.c)
+MODULE_SOURCES=$(wildcard modules/*.c)
 MODULE_OBJ_FILES=$(MODULE_SOURCES:%.c=%.o)
-MODULE_TARGETS=$(MODULE_SOURCES:${VPATH}/modules/%.c=${LIBDIR}/modules/%.bc)
-
-HEADER_TARGETS=$(INCLUDE_FILES:${VPATH}/include/%.h=${VPATH}/../include/%.h)
+MODULE_TARGETS=$(MODULE_SOURCES:modules/%.c=${LIBDIR}/modules/%.bc)
 
 .PHONY: default clean
-default: ${TARGET_LIB} ${MODULE_TARGETS} ${HEADER_TARGETS}
+default: ${TARGET_LIB} ${MODULE_TARGETS}
 
 
 CFLAGS=${LLVM_TARGET_FLAGS} -O1 -ggdb -emit-llvm
 OPT_FLAGS=-mem2reg -globalopt -simplifycfg -constprop -always-inline -instcombine -dse -loop-simplify -reassociate -licm -gvn
 WARNINGS=-Wno-int-to-pointer-cast -Wno-int-conversion -Wno-incompatible-pointer-types-discards-qualifiers -Wno-pointer-type-mismatch
-INCLUDES=-I${POLYGLOT_INC} -I${VPATH}/include
+INCLUDES=-I${POLYGLOT_INC} -Iinclude
 
 
 rebuild:
-	$(MAKE) -C ${VPATH} clean
-	$(MAKE) -C ${VPATH} ${TARGET_LIB} ${MODULE_TARGETS} ${HEADER_TARGETS}
+	$(MAKE) clean
+	$(MAKE) ${TARGET_LIB} ${MODULE_TARGETS}
 
-${LIBDIR}/modules/%.bc: ${VPATH}/modules/%.o
+${LIBDIR}/modules/%.bc: modules/%.o
 	$(QUIETLY) mkdir -p ${LIBDIR}/modules
 	$(QUIETLY) llvm-link -o $@ $+
 
 ${TARGET_LIB}: ${OBJ_FILES}
 	$(QUIETLY) llvm-link -o $@ $+
 
-${VPATH}/src/%.o: ${VPATH}/src/%.c ${VPATH}/Makefile ${VPATH}/src/capi.h ${INCLUDE_FILES}
+src/%.o: src/%.c Makefile src/capi.h ${INCLUDE_FILES}
 	$(QUIETLY) clang ${CFLAGS} ${WARNINGS} ${INCLUDES} -o $@ -c $<
 	$(QUIETLY) opt -o $@ $@ ${OPT_FLAGS}
 
-${VPATH}/modules/%.o: ${VPATH}/modules/%.c ${VPATH}/Makefile ${VPATH}/src/capi.h ${INCLUDE_FILES}
+modules/%.o: modules/%.c Makefile src/capi.h ${INCLUDE_FILES}
 	$(QUIETLY) clang ${CFLAGS} ${WARNINGS} ${INCLUDES} -o $@ -c $<
 	$(QUIETLY) opt -o $@ $@ ${OPT_FLAGS}
 
-${VPATH}/../include/%.h: ${INCLUDE_FILES}
-	$(QUIETLY) mkdir -p ${VPATH}/../include/
-	$(QUIETLY) cp $(@:${VPATH}/../include/%.h=${VPATH}/include/%.h) $@
-
 clean:
 	$(QUIETLY) rm -f ${TARGET_LIB}
-	$(QUIETLY) rm -f ${TARGET_LIB}.bc
 	$(QUIETLY) rm -f ${OBJ_FILES}
+	$(QUIETLY) rm -f ${MODULE_TARGETS}
+	$(QUIETLY) rm -f ${MODULE_OBJ_FILES}

mx.graalpython/suite.py

@@ -113,12 +113,6 @@
             "source": []
         },
 
-        "python.include": {
-            "type": "python",
-            "path": 'graalpython/include',
-            "source": []
-        },
-
         "python.site-packages": {
             "type": "python",
             "path": 'graalpython/site-packages',
@@ -235,7 +229,7 @@
         "com.oracle.graal.python.cext": {
             "subDir": "graalpython",
             "native": True,
-            "vpath": True,
+            "vpath": False,
             "results": ["graalpython/lib-graalpython"],
             "output": ".",
             "buildDependencies": [