Skip to content

Commit

Permalink
Merge pull request #7 from david-c-miller/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
David Miller authored Feb 13, 2017
2 parents a143445 + bf07e1c commit 93724e6
Show file tree
Hide file tree
Showing 18 changed files with 300 additions and 407 deletions.
49 changes: 22 additions & 27 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,32 +1,27 @@
*~
*.tar.gz

# Compiled Object files
*.slo
*.lo
*.o
*.obj

# Precompiled Headers
*.gch
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Fortran module files
*.mod
*.smod

# Compiled Static libraries
*.lai
*.la
*.a
*.lib

# Executables
*.exe
*.out
*.app

# Binary related files
gmon.out
bin/*
test-output/*

# autoconf/automake files
.deps
.dirstamp
aclocal.m4
autom4te.cache
config.log
config.status
compile
configure
depcomp
install-sh
INSTALL
Makefile
Makefile.in
missing

Empty file added AUTHORS
Empty file.
1 change: 1 addition & 0 deletions COPYING
Empty file added ChangeLog
Empty file.
120 changes: 0 additions & 120 deletions Makefile

This file was deleted.

80 changes: 80 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
SUFFIXES = .c .h

WARN_FLAGS = -Wall -Wextra -pedantic $(WARN_EXTRA)
L_FLAGS = -lm

AM_CFLAGS = $(WARN_FLAGS) -std=c99
LDADD = $(L_FLAGS)

bin_PROGRAMS = bin/generateTMDSuperCell
bin_generateTMDSuperCell_SOURCES = src/generateTMDSuperCell.c src/tmd_functions.c src/printing.c\
src/fractional.c src/atomic_sites.c src/structure.c\
src/testing.c src/elements.h src/header.h


debug:
make clean; make "CFLAGS=$(AM_CFLAGS) $(ERROR_FLAG) $(O_FLAG_0)";

optim:
make clean; make "CFLAGS=$(AM_CFLAGS) $(O_FLAG_3)";

.PHONY : debug optim

#extra flags

O_FLAG_0 = -g3 -pg -O0
O_FLAG_1 = -g1 -pg -O1
O_FLAG_2 = -O2
O_FLAG_3 = -O3

WARN_EXTRA = \
-Wfloat-equal\
-Wunused\
-Wunknown-pragmas\
-Wwrite-strings\
-Winit-self\
-Wcast-align\
-Wcast-qual\
-Wpointer-arith\
-Wstrict-aliasing\
-Wmissing-declarations\
-Wmissing-include-dirs\
-Wno-unused-parameter\
-Wuninitialized\
-Wcast-align\
-Wcast-qual\
-Wdisabled-optimization\
-Wformat=2\
-Wredundant-decls\
-Wshadow\
-Wstrict-overflow=4\
-Wswitch-default\
-Wundef\
-Wno-unused\
-Wsign-conversion\
-Wmissing-format-attribute\
-Wtype-limits\
-Wconversion\
-Wsign-compare\
-Wmissing-field-initializers\
-Wno-multichar\
-Winline\
$(GCC_WARN_EXTRA)

GCC_WARN_EXTRA=\
-Wsuggest-attribute=pure\
-Wsuggest-attribute=const\
-Wsuggest-attribute=noreturn\
-Wlogical-op

GCC_NEW_WARN_EXTRA=\
-Wmaybe-uninitialized\
-Wsuggest-attribute=format\
-Wnarrowing

ERROR_FLAG=\
-Werror\
-Wno-error=unused-parameter\
-Wno-error=unused-variable\
-Wno-error=pedantic

Empty file added NEWS
Empty file.
Loading

0 comments on commit 93724e6

Please sign in to comment.