diff options
| author | Memphiz <memphis@machzwo.de> | 2014-06-03 19:12:34 +0200 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2014-06-03 19:12:34 +0200 |
| commit | 0765a526f6993239d592a79ec28d81ce68318cf5 (patch) | |
| tree | 54a1807dbee1688e8c3d74d62e7b69c7100d0e60 /tools/depends/native | |
| parent | 41afe730e32aed9d5a80911473cc52c6b252ceb1 (diff) | |
| parent | e7e4c7b4e2bba33ae9108a18493e397a8f49c68f (diff) | |
Merge pull request #4846 from Memphiz/fixjsonbuilder
[jsonbuilder] - do it properly ...
Diffstat (limited to 'tools/depends/native')
5 files changed, 43 insertions, 24 deletions
diff --git a/tools/depends/native/JsonSchemaBuilder/Makefile b/tools/depends/native/JsonSchemaBuilder/Makefile index e2fccf7917..cf5d20b055 100644 --- a/tools/depends/native/JsonSchemaBuilder/Makefile +++ b/tools/depends/native/JsonSchemaBuilder/Makefile @@ -1,9 +1,10 @@ +ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) -include ../../Makefile.include ifeq ($(NATIVEPREFIX),) - PREFIX = . + PREFIX = $(ROOT_DIR) else - PREFIX = $(NATIVEPREFIX)/bin + PREFIX = $(NATIVEPREFIX) endif ifeq ($(NATIVEPLATFORM),) @@ -12,15 +13,32 @@ else PLATFORM = $(NATIVEPLATFORM) endif +SOURCE=$(ROOT_DIR)/src + +CONFIGURE=./configure --prefix=$(PREFIX) +APP=$(SOURCE)/JsonSchemaBuilder +APPBIN=$(PREFIX)/bin/JsonSchemaBuilder + all: .installed-$(PLATFORM) -$(PREFIX)/JsonSchemaBuilder: - make -C src - cp src/JsonSchemaBuilder $(PREFIX) +$(PLATFORM): + -rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) + cd $(PLATFORM); cp -a $(SOURCE)/* . + cd $(PLATFORM); ./autogen.sh + cd $(PLATFORM); $(CONFIGURE) -clean: - make -C src clean - @rm -f JsonSchemaBuilder .installed-$(PLATFORM) -.installed-$(PLATFORM): $(PREFIX)/JsonSchemaBuilder +$(APP): $(PLATFORM) + $(MAKE) -C $(PLATFORM) + + +.installed-$(PLATFORM): $(APP) + $(MAKE) -C $(PLATFORM) install touch $@ + +clean: + $(MAKE) -C $(PLATFORM) clean + +distclean:: + rm -rf $(PLATFORM) .installed-$(PLATFORM) + -rm -rf bin diff --git a/tools/depends/native/JsonSchemaBuilder/src/Makefile b/tools/depends/native/JsonSchemaBuilder/src/Makefile deleted file mode 100644 index 3edd663181..0000000000 --- a/tools/depends/native/JsonSchemaBuilder/src/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -APP=JsonSchemaBuilder - -SOURCES := $(shell ls *.cpp) - -OBJS := $(SOURCES:.cpp=.o) -all: $(APP) - -$(APP): $(OBJS) - $(CXX) $(CFLAGS) -o $(APP) $(OBJS) $(LFLAGS) $(LIBS) - -.cpp.o: - $(CXX) $(CFLAGS) $(INCLUDES) -c $< - -clean: - rm -f $(OBJS) $(SOURCES:.cpp=.d) $(APP) diff --git a/tools/depends/native/JsonSchemaBuilder/src/Makefile.am b/tools/depends/native/JsonSchemaBuilder/src/Makefile.am new file mode 100644 index 0000000000..1d5e071bca --- /dev/null +++ b/tools/depends/native/JsonSchemaBuilder/src/Makefile.am @@ -0,0 +1,3 @@ +bin_PROGRAMS = JsonSchemaBuilder +JsonSchemaBuilder_SOURCES = JsonSchemaBuilder.cpp + diff --git a/tools/depends/native/JsonSchemaBuilder/src/autogen.sh b/tools/depends/native/JsonSchemaBuilder/src/autogen.sh new file mode 100755 index 0000000000..872167c61f --- /dev/null +++ b/tools/depends/native/JsonSchemaBuilder/src/autogen.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +autoreconf -vif diff --git a/tools/depends/native/JsonSchemaBuilder/src/configure.ac b/tools/depends/native/JsonSchemaBuilder/src/configure.ac new file mode 100644 index 0000000000..54ebee20f4 --- /dev/null +++ b/tools/depends/native/JsonSchemaBuilder/src/configure.ac @@ -0,0 +1,10 @@ +dnl Process this file with autoconf to produce a configure script. +AC_INIT(JsonSchemaBuilder, 1.0, me@mail.com) +AC_CONFIG_AUX_DIR(config) +AC_CONFIG_SRCDIR(JsonSchemaBuilder.cpp) + +AM_INIT_AUTOMAKE([foreign]) + +AC_PROG_CXX + +AC_OUTPUT(Makefile) |