Skip to content
Permalink
Browse files

Simplified sub-module inclusion

  • Loading branch information...
smarco committed Aug 3, 2019
1 parent a983fd0 commit bb406d54d1949e85757cd025b252868b6914b85c
Showing with 61 additions and 485 deletions.
  1. +0 −3 .gitmodules
  2. +3 −8 Makefile
  3. +0 −11 Makefile.mk.in
  4. +0 −78 autom4te.cache/requests
  5. +0 −319 autom4te.cache/traces.0
  6. +49 −57 config.log
  7. +4 −4 config.status
  8. +5 −5 resources/Makefile

This file was deleted.

@@ -53,11 +53,6 @@ complexity:
setup:
@-mkdir -p $(FOLDER_BIN) $(FOLDER_BUILD) $(FOLDER_LIB)
@-ln -s $(FOLDER_RESOURCES) $(FOLDER_INCLUDE)/resources 2> /dev/null ||:
ifeq ($(HAVE_CUDA),1)
ifeq ($(HAVE_CUTTER),0)
@-git submodule update --init --recursive 2> /dev/null ||:
endif
endif

clean:
$(MAKE) --directory=resources clean
@@ -68,14 +63,14 @@ distclean: clean
@rm -f config.status config.log Makefile.mk

archive:
#taken from https://ttboj.wordpress.com/2015/07/23/git-archive-with-submodules-and-tar-magic/
# Taken from https://ttboj.wordpress.com/2015/07/23/git-archive-with-submodules-and-tar-magic/
@echo Running git archive...
# use HEAD if tag doesn't exist yet, so that development is easier...
# Use HEAD if tag doesn't exist yet, so that development is easier...
git archive --prefix=gem3-mapper/ -o $(ARCHIVENAME) $(VERSION) 2> /dev/null || (echo 'Warning: $(VERSION) does not exist.' && git archive --prefix=gem3-mapper/ -o $(ARCHIVENAME) HEAD)
# TODO: if git archive had a --submodules flag this would easier!
mkdir -p archivebuild
@echo Running git archive submodules...
# i thought i would need --ignore-zeros, but it doesn't seem necessary!
# I thought I would need --ignore-zeros, but it doesn't seem necessary!
p=`pwd` && (echo .; git submodule foreach) | while read entering path; do \
temp="$${path%\'}"; \
temp="$${temp#\'}"; \
@@ -221,16 +221,6 @@ endif
# CUDA
###############################################################################
ifeq ($(HAVE_CUDA),1)
HAVE_CUTTER=$(if $(shell ls -A $(FOLDER_RESOURCES)/gem-cutter 2> /dev/null),1,0)
else
HAVE_CUTTER=0
endif
ifeq ($(notdir $(CURDIR)), gem-cutter)
HAVE_CUTTER=1
HAVE_CUDA=1
endif
ifeq ($(HAVE_CUDA),1)
ifeq ($(HAVE_CUTTER),1)
# Paths
DEF_CUDA=-DHAVE_CUDA
PATH_CUDA=@CUDA_PATH@
@@ -241,7 +231,6 @@ ifeq ($(HAVE_CUTTER),1)
CUDA_PROFILE_LIB=-lnvToolsExt
CUDA_LIB=-lcuda -lcudart -lstdc++
endif
endif

###############################################################################
# VTune

This file was deleted.

0 comments on commit bb406d5

Please sign in to comment.
You can’t perform that action at this time.