| 1 | --- ../cache/imgflo-0.4.2/Makefile 2016-08-21 08:46:27.000000000 +0000 |
| 2 | +++ ./Makefile 2017-05-07 11:34:05.803206274 +0000 |
| 3 | @@ -1,7 +1,5 @@ |
| 4 | |
| 5 | VERSION=$(shell echo `git describe --tags`) |
| 6 | -#PREFIX=/opt/imgflo |
| 7 | -PREFIX=$(shell echo `pwd`/install) |
| 8 | FLAGS=-Wall -Werror -std=c99 -g |
| 9 | DEBUGPROG= |
| 10 | PORT=3569 |
| 11 | @@ -23,8 +21,8 @@ |
| 12 | |
| 13 | LIBS=gegl-0.3 libsoup-2.4 |
| 14 | SYSTEM_LIBS=gio-unix-2.0 json-glib-1.0 libpng |
| 15 | -DEPS=$(shell $(PREFIX)/env.sh pkg-config $(PKGCONFIG_ARGS) --libs --cflags $(LIBS)) |
| 16 | -DEPS+=$(shell $(PREFIX)/env.sh pkg-config --libs --cflags $(SYSTEM_LIBS)) |
| 17 | +DEPS=$(shell pkg-config $(PKGCONFIG_ARGS) --libs --cflags $(LIBS)) |
| 18 | +DEPS+=$(shell pkg-config --libs --cflags $(SYSTEM_LIBS)) |
| 19 | TRAVIS_DEPENDENCIES=$(shell echo `cat .vendor_urls | sed -e "s/heroku/travis-${TRAVIS_OS_NAME}/" | tr -d '\n'`) |
| 20 | |
| 21 | RUN_ARGUMENTS:=--port $(PORT) --external-port=$(EXTPORT) |
| 22 | @@ -53,31 +51,31 @@ |
| 23 | all: install |
| 24 | |
| 25 | run-noinstall: |
| 26 | - $(PREFIX)/env.sh $(DEBUGPROG) ./bin/imgflo-runtime $(RUN_ARGUMENTS) |
| 27 | + $(DEBUGPROG) ./bin/imgflo-runtime $(RUN_ARGUMENTS) |
| 28 | |
| 29 | run: install run-noinstall |
| 30 | |
| 31 | process: install |
| 32 | - $(PREFIX)/env.sh $(DEBUGPROG) ./bin/imgflo $(PROCESS_ARGUMENTS) |
| 33 | + $(DEBUGPROG) ./bin/imgflo $(PROCESS_ARGUMENTS) |
| 34 | |
| 35 | -install: env imgflo imgflo-runtime imgflo-graphinfo |
| 36 | +install: imgflo imgflo-runtime imgflo-graphinfo |
| 37 | cp ./bin/imgflo $(PREFIX)/bin/ |
| 38 | cp ./bin/imgflo-runtime $(PREFIX)/bin/ |
| 39 | cp ./bin/imgflo-graphinfo $(PREFIX)/bin/ |
| 40 | |
| 41 | imgflo: |
| 42 | - $(PREFIX)/env.sh $(CC) -o ./bin/imgflo bin/imgflo.c -I. $(FLAGS) $(DEPS) |
| 43 | + $(CC) -o ./bin/imgflo bin/imgflo.c -I. $(FLAGS) $(DEPS) |
| 44 | |
| 45 | imgflo-graphinfo: |
| 46 | - $(PREFIX)/env.sh $(CC) -o ./bin/imgflo-graphinfo bin/imgflo-graphinfo.c -I. $(FLAGS) $(DEPS) |
| 47 | + $(CC) -o ./bin/imgflo-graphinfo bin/imgflo-graphinfo.c -I. $(FLAGS) $(DEPS) |
| 48 | |
| 49 | imgflo-runtime: |
| 50 | - $(PREFIX)/env.sh $(CC) -o ./bin/imgflo-runtime bin/imgflo-runtime.c -I. $(FLAGS) $(DEPS) |
| 51 | + $(CC) -o ./bin/imgflo-runtime bin/imgflo-runtime.c -I. $(FLAGS) $(DEPS) |
| 52 | |
| 53 | env: |
| 54 | - mkdir -p $(PREFIX) || true |
| 55 | - sed -e 's|@PREFIX@|$(PREFIX)|' env.sh.in > $(PREFIX)/env.sh |
| 56 | - chmod +x $(PREFIX)/env.sh |
| 57 | +# mkdir -p $(PREFIX) || true |
| 58 | +# sed -e 's|@PREFIX@|$(PREFIX)|' env.sh.in > $(PREFIX)/env.sh |
| 59 | +# chmod +x $(PREFIX)/env.sh |
| 60 | |
| 61 | travis-deps: |
| 62 | wget -O imgflo-dependencies.tgz $(TRAVIS_DEPENDENCIES) |
| 63 | @@ -93,14 +91,14 @@ |
| 64 | COMPONENT_FLAGS += -DIMGFLO_OP_NAME\(orig\)=\"$(COMPONENT_NAME_PREFIX)\"orig\"$(COMPONENT_NAME_SUFFIX)\" |
| 65 | endif |
| 66 | |
| 67 | -component-install-dir: env |
| 68 | +component-install-dir: |
| 69 | rm -rf $(COMPONENTINSTALLDIR) |
| 70 | mkdir -p $(COMPONENTINSTALLDIR) || true |
| 71 | components: component-install-dir $(COMPONENT_PLUGINS) |
| 72 | component: component-install-dir $(COMPONENT_OUT) |
| 73 | |
| 74 | $(COMPONENTINSTALLDIR)/%.$(SHAREDLIB_SUFFIX): $(COMPONENTDIR)/%.c |
| 75 | - $(PREFIX)/env.sh $(CC) -o $@ $< -DGEGL_OP_C_FILE=\"`basename $<`\" $(COMPONENT_FLAGS) $(DEPS) |
| 76 | + $(CC) -o $@ $< -DGEGL_OP_C_FILE=\"`basename $<`\" $(COMPONENT_FLAGS) $(DEPS) |
| 77 | |
| 78 | dependencies: |
| 79 | cd dependencies && make PREFIX=$(PREFIX) dependencies |
| 80 | @@ -115,7 +113,7 @@ |
| 81 | cd dependencies && make PREFIX=$(PREFIX) glib |
| 82 | |
| 83 | check: install |
| 84 | - $(PREFIX)/env.sh ./node_modules/.bin/mocha --reporter spec --compilers .coffee:coffee-script/register ./spec/*.coffee $(TEST_ARGUMENTS) |
| 85 | + ./node_modules/.bin/mocha --reporter spec --compilers .coffee:coffee-script/register ./spec/*.coffee $(TEST_ARGUMENTS) |
| 86 | |
| 87 | clean: |
| 88 | git clean -dfx --exclude node_modules --exclude install |