Skip to content

Commit 1478610

Browse files
Merge branch 'iss-24' into develop
2 parents 52500dd + df3cca7 commit 1478610

File tree

17 files changed

+14135
-935
lines changed

17 files changed

+14135
-935
lines changed

.gitignore

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,27 @@ without-cpp11-pthread-tests
3131
with-cpp11-pthread-tests
3232

3333
# Xcode
34-
#cpp-pthread.xcodeproj/
34+
*.xcodeproj/
3535
DerivedData/
3636

37+
# MAc OS X
38+
.DS_Store
39+
40+
# MAc OS X
41+
.DS_Store
42+
._*
43+
3744
# autoconf
3845
config.h
3946
autom4te.cache
4047
config.status
4148
config.log
42-
configure
49+
#configure
4350
Makefile
4451

4552
# layout
53+
doxyfile
54+
distrib/
4655
lib/
4756
doc/
4857
pthread-tests

Makefile.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ all:
1818
cd src && $(MAKE) clean all
1919

2020
pkg:
21-
tar cf - ./ | gzip -c > distrib/$(PACKAGE)
21+
$(MKDIR) distrib
22+
tar cf - `git ls-files` | gzip -c > distrib/$(PACKAGE)
2223

2324
globber:clean
2425
-$(RM) -R Makefile autom4te.cache config.log config.status
25-
-(cd src && $(MAKE) globber)
2626

2727
clean:
28-
cd src && $(MAKE) clean
28+
-(cd src && $(MAKE) clean)
2929

3030
doxygen:
3131
${DOXYGEN} doxyfile

README.md

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,46 +16,44 @@ Install moves files into your system's default localtion of headers and librarie
1616
configure --prefix=/usr/local
1717
```
1818

19-
[Doxygen documentation](http://herbertkoelman.github.io/cpp-pthread/doc/html/) can be generated with this command:
19+
[Doxygen documentation](http://herbertkoelman.github.io/cpp-pthread/doc/html/) can be generated with this command. I hope this help make things easier to use and understand.
2020
```
2121
make doxygen
22-
...
2322
```
2423

25-
The target `pkg` will produce au tar.gz.
24+
> Doxygen can be downloaded [here](http://www.stack.nl/~dimitri/doxygen/index.html).
2625
27-
This command creates a `doc` directory wich will contain the generated documentation.
28-
29-
> **warning** generating documentation requires that doxygen is installed.
30-
31-
The confugre file is not versionned, therefore it is required to run `autoconf` to generate one
32-
```
33-
autoconf
34-
( cd src && autoconf )
35-
( cd tests && autoconf )
36-
```
26+
The `make` target `pkg` will produce au tar.gz that can be distributed.
3727

3828
### How to use it
3929

40-
Once compiled and installed in a location that suites you, use your compiler options to reference the headers and the libraries directory. In almoast all casses you can:
30+
Once compiled and installed in a location that suites you, use your compiler options to reference the headers and the library directory. In almoast all casses you can:
4131
* include `#include "pthread/phtread.hpp"` in your code.
4232
* comment the c++11 standard includes in your code
4333
* declare that you're now using the namespace pthread (`using namespace pthread ;`)
4434

45-
It should now compile use this very simple (but often good enough) implementation.
35+
Sample code can be found in the `tests` directory. To use it, run the following commands:
36+
```
37+
cd tests
38+
./configure
39+
./make
40+
```
4641

4742
### Usefull links
4843

49-
* [documentation](http://pubs.opengroup.org/onlinepubs/007908799/xsh/threads.html) of the underlying POSIX threading library
44+
#### project links
45+
5046
* [project's home](https://github.com/HerbertKoelman/cpp-pthread)
5147
* [project's doxygen](http://herbertkoelman.github.io/cpp-pthread/doc/html/)
48+
49+
#### other
50+
51+
* POSIX Threads [documentation](http://pubs.opengroup.org/onlinepubs/007908799/xsh/threads.html)
5252
* [std::thread](http://en.cppreference.com/w/cpp/thread/thread) implementation we try to mimic
5353
* [std::lock_guard](http://en.cppreference.com/w/cpp/thread/lock_guard/lock_guard) implementation we try to mimic
5454
* [std::mutex](http://en.cppreference.com/w/cpp/thread/mutex) implementation we try to mimic
5555
* [std::condition_variable](http://en.cppreference.com/w/cpp/thread/condition_variable) implementation we try to mimic
5656

57-
More [here](https://github.com/HerbertKoelman/cpp-pthread/wiki)
58-
5957
### misc
6058

6159
* author herbert koelman

0 commit comments

Comments
 (0)