mirror of
git://git.psyc.eu/libpsyc
synced 2024-08-15 03:19:02 +00:00
Merge remote-tracking branch 'l/master'
This commit is contained in:
commit
a0abf99f72
6 changed files with 33 additions and 19 deletions
|
@ -15,13 +15,15 @@ and you are done.
|
||||||
|
|
||||||
Other possible targets include:
|
Other possible targets include:
|
||||||
|
|
||||||
: make install [prefix=/usr] # install into prefix
|
: make install PREFIX=/usr # install into PREFIX
|
||||||
|
: make install DESTDIR=/tmp/t # install into DESTDIR
|
||||||
: make diet # compile with diet libc
|
: make diet # compile with diet libc
|
||||||
: make test # compile and run the tests
|
: make test # compile and run the tests
|
||||||
: make doc # generate the API documentation (will be put in the doc folder)
|
: make doc # generate the API documentation using doxygen
|
||||||
|
# (will be put in the doc folder)
|
||||||
: make help # display the possible targets
|
: make help # display the possible targets
|
||||||
|
|
||||||
On BSD try this:
|
On BSD try this:
|
||||||
|
|
||||||
: sudo gmake install prefix=/usr/local
|
: sudo gmake install PREFIX=/usr/local
|
||||||
|
|
||||||
|
|
24
Makefile
24
Makefile
|
@ -1,6 +1,8 @@
|
||||||
.PHONY: doc test bench
|
.PHONY: doc test bench
|
||||||
.NOTPARALLEL: clean
|
.NOTPARALLEL: clean
|
||||||
|
|
||||||
|
export PREFIX="$(DESTDIR)/usr"
|
||||||
|
|
||||||
indent_args = -nbad -bap -bbo -nbc -br -brs -ncdb -cdw -ce -ci4 -cli0 -cs -d0 -di1 \
|
indent_args = -nbad -bap -bbo -nbc -br -brs -ncdb -cdw -ce -ci4 -cli0 -cs -d0 -di1 \
|
||||||
-nfc1 -nfca -hnl -i4 -ip0 -l80 -lp -npcs -nprs -npsl -saf -sai -saw -nsc -nsob -nss
|
-nfc1 -nfca -hnl -i4 -ip0 -l80 -lp -npcs -nprs -npsl -saf -sai -saw -nsc -nsob -nss
|
||||||
|
|
||||||
|
@ -9,15 +11,31 @@ all:
|
||||||
|
|
||||||
it: all
|
it: all
|
||||||
|
|
||||||
|
destdir:
|
||||||
|
-@if test "foo$(DESTDIR)" != "foo" ; then \
|
||||||
|
mkdir "$(DESTDIR)" ;\
|
||||||
|
fi
|
||||||
|
@if test "foo$(PREFIX)" = "foo" ; then \
|
||||||
|
echo "libpsyc install: You must provide a PREFIX=/usr or such." ;\
|
||||||
|
exit 2 ;\
|
||||||
|
else true; fi
|
||||||
|
-@if [ ! -w "$(PREFIX)" ]; then \
|
||||||
|
mkdir "$(PREFIX)" ;\
|
||||||
|
fi
|
||||||
|
@if [ ! -w "$(PREFIX)" ]; then \
|
||||||
|
echo "libpsyc install: You must provide a writable PREFIX." ;\
|
||||||
|
exit 2 ;\
|
||||||
|
else true; fi
|
||||||
|
|
||||||
install: install-lib install-inc install-d
|
install: install-lib install-inc install-d
|
||||||
|
|
||||||
install-lib: all
|
install-lib: destdir all
|
||||||
${MAKE} -C lib install
|
${MAKE} -C lib install
|
||||||
|
|
||||||
install-inc: all
|
install-inc: destdir all
|
||||||
${MAKE} -C include install
|
${MAKE} -C include install
|
||||||
|
|
||||||
install-d: all
|
install-d: destdir all
|
||||||
${MAKE} -C d install
|
${MAKE} -C d install
|
||||||
|
|
||||||
debug:
|
debug:
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
prefix = /usr
|
includedir = ${PREFIX}/include/d
|
||||||
includedir = ${prefix}/include/d
|
|
||||||
|
|
||||||
INSTALL = install
|
INSTALL = install
|
||||||
HEADERS = common.d parse.d
|
HEADERS = common.d parse.d
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
prefix = /usr
|
includedir = ${PREFIX}/include
|
||||||
includedir = ${prefix}/include
|
|
||||||
|
|
||||||
INSTALL = install
|
INSTALL = install
|
||||||
HEADERS = psyc.h
|
HEADERS = psyc.h
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
# Why do we have a Makefile in the include directory?
|
includedir = ${PREFIX}/include
|
||||||
|
|
||||||
prefix = /usr
|
|
||||||
includedir = ${prefix}/include
|
|
||||||
|
|
||||||
INSTALL = install
|
INSTALL = install
|
||||||
HEADERS = match.h method.h packet.h parse.h render.h text.h uniform.h variable.h
|
HEADERS = match.h method.h packet.h parse.h render.h text.h uniform.h variable.h
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
prefix = /usr
|
libdir = ${PREFIX}/lib
|
||||||
libdir = ${prefix}/lib
|
|
||||||
|
|
||||||
INSTALL = install
|
INSTALL = install
|
||||||
LIBS = libpsyc.a libpsyc.so
|
LIBS = libpsyc.a libpsyc.so
|
||||||
|
|
Loading…
Reference in a new issue