Commit 5ebcf87b authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Significant changes to build system

parent 539ce6ed
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -6,4 +6,4 @@ configure
depcomp
install-sh
missing
src/Makefile.in
build-aux
+22 −1
Original line number Diff line number Diff line
SUBDIRS = src
ACLOCAL_AMFLAGS = -I m4

SUBDIRS = lib examples

DIST_SUBDIRS = lib examples

bin_PROGRAMS = src/dloom #app

src_dloom_SOURCES = \
	src/dloom.cpp

src_dloom_CXXFLAGS = 			\
	@TBB_CFLAGS@ 				\
	-std=gnu++11 -Wall -Wextra

src_dloom_LDFLAGS = \
	@TBB_LIBS@

#norn_a_AR = $(CXX) -ar -o 

#app_SOURCES = app.c norn.c
#app_CFLAGS = 
+22 −6
Original line number Diff line number Diff line
#                       -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.

AC_PREREQ([2.69])
AC_INIT([Norn-s loom], [1.0], [arnau.bagocastro at bsc.es])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AC_CONFIG_SRCDIR([config.h.in])
AC_CONFIG_HEADERS([config.h])
AC_PREREQ([2.69])
AC_CONFIG_SRCDIR([src/config.h.in])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([src/config.h])

AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])

# Checks for programs.
AC_PROG_AWK
AC_PROG_CXX
AC_PROG_CC

LT_INIT

# check that c++11 is supported by the compiler
AX_CHECK_COMPILE_FLAG([-std=c++11], [CXXFLAGS+=" -std=c++11"], [
    echo "C++ compiler cannot compile C++11 code"
    exit -1
])

# Checks for libraries.I

# check that Intel's TBB
PKG_CHECK_MODULES([TBB], [tbb])

# Checks for header files.

# Checks for typedefs, structures, and compiler characteristics.
AC_CHECK_HEADER_STDBOOL

# Checks for library functions.
AC_CONFIG_FILES([Makefile
		src/Makefile])
AC_CONFIG_FILES([
        Makefile
        lib/Makefile
        examples/Makefile])
AC_OUTPUT

examples/Makefile.am

0 → 100644
+15 −0
Original line number Diff line number Diff line

bin_PROGRAMS = app

app_SOURCES = \
	app.c

app_CFLAGS = \
	-std=c99 -Wall -Wextra

app_CPPFLAGS = \
	-I$(top_srcdir)/include

app_LDADD = \
	$(top_builddir)/lib/libnorn.la
+2 −0
Original line number Diff line number Diff line
#include <libnorn.h>
#include <stdio.h>


int main() {
   printf("Hello, World! I'm the app \n");
   initialize();
Loading