Skip to content
Snippets Groups Projects
Commit 3fff080d authored by Pedro Gonnet's avatar Pedro Gonnet
Browse files

added second test with conflicts.

parent defda215
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
examples/Makefile.am
+ 1
− 1
View file @ 3fff080d
...@@ -22,7 +22,7 @@ AUTOMAKE_OPTIONS=gnu ...@@ -22,7 +22,7 @@ AUTOMAKE_OPTIONS=gnu
# Add the source directory and debug to CFLAGS # Add the source directory and debug to CFLAGS
AM_CFLAGS = -g -Wall -Werror -I../src $(OPENMP_CFLAGS) -DCPU_TPS=2.67e9 AM_CFLAGS = -g -Wall -Werror -I../src $(OPENMP_CFLAGS) -DCPU_TPS=2.67e9
AM_LDFLAGS = AM_LDFLAGS = -lm
# Set-up the library # Set-up the library
bin_PROGRAMS = test bin_PROGRAMS = test
......
examples/Makefile.in
+ 1
− 1
View file @ 3fff080d
...@@ -271,7 +271,7 @@ AUTOMAKE_OPTIONS = gnu ...@@ -271,7 +271,7 @@ AUTOMAKE_OPTIONS = gnu
# Add the source directory and debug to CFLAGS # Add the source directory and debug to CFLAGS
AM_CFLAGS = -g -Wall -Werror -I../src $(OPENMP_CFLAGS) -DCPU_TPS=2.67e9 AM_CFLAGS = -g -Wall -Werror -I../src $(OPENMP_CFLAGS) -DCPU_TPS=2.67e9
AM_LDFLAGS = AM_LDFLAGS = -lm
# Sources for test # Sources for test
test_SOURCES = test.c test_SOURCES = test.c
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment