Skip to content

Commit 4326d7e

Browse files
author
Sebastiano Merlino
committed
Merge branch 'master' of github.com:etr/libhttpserver
Conflicts: Makefile.in src/Makefile.in
2 parents e06492f + d620b87 commit 4326d7e

34 files changed

+797
-80083
lines changed

‎AUTHORS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Primary developer:
2+
Sebastiano Merlino <electrictwister2000@gmail.com>

‎COPYING‎

Lines changed: 488 additions & 658 deletions
Large diffs are not rendered by default.

‎INSTALL‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,30 +51,32 @@ of `autoconf'.
5151
The simplest way to compile this package is:
5252

5353
1. `cd' to the directory containing the package's source code and type
54-
`./configure' to configure the package for your system.
54+
`make -f Makefile.cvs` to create configure file.
55+
56+
2. `./configure' to configure the package for your system.
5557

5658
Running `configure' might take a while. While running, it prints
5759
some messages telling which features it is checking for.
5860

59-
2. Type `make' to compile the package.
61+
3. Type `make' to compile the package.
6062

61-
3. Optionally, type `make check' to run any self-tests that come with
63+
4. Optionally, type `make check' to run any self-tests that come with
6264
the package, generally using the just-built uninstalled binaries.
6365

64-
4. Type `make install' to install the programs and any data files and
66+
5. Type `make install' to install the programs and any data files and
6567
documentation. When installing into a prefix owned by root, it is
6668
recommended that the package be configured and built as a regular
6769
user, and only the `make install' phase executed with root
6870
privileges.
6971

70-
5. Optionally, type `make installcheck' to repeat any self-tests, but
72+
6. Optionally, type `make installcheck' to repeat any self-tests, but
7173
this time using the binaries in their final installed location.
7274
This target does not install anything. Running this target as a
7375
regular user, particularly if the prior `make install' required
7476
root privileges, verifies that the installation completed
7577
correctly.
7678

77-
6. You can remove the program binaries and object files from the
79+
7. You can remove the program binaries and object files from the
7880
source code directory by typing `make clean'. To also remove the
7981
files that `configure' created (so you can compile the package for
8082
a different kind of computer), type `make distclean'. There is
@@ -83,12 +85,12 @@ of `autoconf'.
8385
all sorts of other programs in order to regenerate files that came
8486
with the distribution.
8587

86-
7. Often, you can also type `make uninstall' to remove the installed
88+
8. Often, you can also type `make uninstall' to remove the installed
8789
files again. In practice, not all packages have tested that
8890
uninstallation works correctly, even though it is required by the
8991
GNU Coding Standards.
9092

91-
8. Some packages, particularly those that use Automake, provide `make
93+
9. Some packages, particularly those that use Automake, provide `make
9294
distcheck', which can by used by developers to test that all other
9395
targets like `make install' and `make uninstall' work correctly.
9496
This target is generally not run by end users.

‎Makefile.am‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ AUTOMAKE_OPTIONS = foreign 1.4
44

55
SUBDIRS = src $(PYTHON_DIR) $(JAVA_DIR) $(PHP_DIR)
66
DIST_SUBDIRS = src $(PYTHON_DIR) $(JAVA_DIR) $(PHP_DIR)
7+
EXTRA_DIST = libhttpserver.pc.in
8+
9+
pkgconfigdir = $(libdir)/pkgconfig
10+
pkgconfig_DATA = libhttpserver.pc
711

812
if PYTHON
913
PYTHON_DIR = src/python

‎Makefile.cvs‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,27 @@
1+
#
2+
# This file is part of libhttpserver
3+
# Copyright (C) 2011 Sebastiano Merlino
4+
#
5+
# This library is free software; you can redistribute it and/or
6+
# modify it under the terms of the GNU Lesser General Public
7+
# License as published by the Free Software Foundation; either
8+
# version 2.1 of the License, or (at your option) any later version.
9+
#
10+
# This library is distributed in the hope that it will be useful,
11+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
# Lesser General Public License for more details.
14+
#
15+
# You should have received a copy of the GNU Lesser General Public
16+
# License along with this library; if not, write to the Free Software
17+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18+
119
default: all
220

321
all:
422
aclocal
523
autoheader
6-
automake
24+
libtoolize --automake
25+
automake --add-missing
726
autoconf
827

0 commit comments

Comments
 (0)