Skip to content

Second general clean-up#233

Merged
sjaeckel merged 12 commits intodevelopfrom
cleanup/2
Jun 20, 2017
Merged

Second general clean-up#233
sjaeckel merged 12 commits intodevelopfrom
cleanup/2

Conversation

@sjaeckel
Copy link
Copy Markdown
Member

  • Use the same header/footer for all files
  • Fix some open issues

@sjaeckel sjaeckel requested a review from karel-m June 19, 2017 13:07
@sjaeckel sjaeckel self-assigned this Jun 19, 2017
@karel-m
Copy link
Copy Markdown
Member

karel-m commented Jun 19, 2017

There are still some old URLs

$ find src tests demos -type f | xargs grep libtom.org
tests/no_prng.c: * http://libtom.org
demos/constants.c: * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
demos/sizes.c: * Tom St Denis, tomstdenis@gmail.com, http://libtom.org

@karel-m
Copy link
Copy Markdown
Member

karel-m commented Jun 19, 2017

We should perhaps also remove Tom's email from:

src/misc/crypt/crypt.c:   "LibTomCrypt " SCRYPT " (Tom St Denis, tomstdenis@gmail.com)\n"

Comment thread makefile.unix
DESTDIR = /usr/local
DESTDIR =
PREFIX = /usr/local
LIBPATH = $(DESTDIR)$(PREFIX)/lib
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You probably wanted to use LIBPATH & co. later in the makefile.unix or not?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I forgot to remove that again... or do you think we should use LIBPATH & co. in all makefiles?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am fine with having just PREFIX in makefile.unix

Comment thread makefile.unix

#The following can be overridden from command line e.g. "make -f makefile.unix CC=gcc ARFLAGS=rcs"
DESTDIR = /usr/local
DESTDIR =
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The DESTDIR = should be perhaps completely removed

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah damn, yeah... or we use it so #232 would also be solved for makefile.unix

@sjaeckel sjaeckel modified the milestone: v1.18.0 Jun 19, 2017
Comment thread helper.pl Outdated
MARKER
my @all_files;
find({ wanted=> sub { push @all_files, $_ if $_ =~ /\.(c|h)$/ }, no_chdir=>1 }, 'src');
find({ wanted=> sub { push @all_files, $_ if $_ =~ /\.(c|h)$/ }, no_chdir=>1 }, 'demos');
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

better:

find({ wanted=> sub { push @all_files, $_ if $_ =~ /\.(c|h)$/ }, no_chdir=>1 }, 'src', 'demos', 'tests');

@karel-m
Copy link
Copy Markdown
Member

karel-m commented Jun 20, 2017

👍 I am for merging (just small cosmetics in helper.pl - see my comment)

@sjaeckel sjaeckel merged commit c14bcf4 into develop Jun 20, 2017
@sjaeckel sjaeckel deleted the cleanup/2 branch June 20, 2017 15:51
@karel-m karel-m mentioned this pull request Jun 27, 2017
9 tasks
@sjaeckel sjaeckel removed their assignment Oct 9, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants