Skip to content

Commit 7ab4090

Browse files
author
Sebastiano Merlino
committed
added licence details in originated files
1 parent 4326d7e commit 7ab4090

File tree

9 files changed

+147
-105
lines changed

9 files changed

+147
-105
lines changed

‎Makefile.am‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
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
# not a GNU package. You can remove this line, if
220
# have all needed files, that a GNU package needs
321
AUTOMAKE_OPTIONS = foreign 1.4

‎configure.ac‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
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
# -*- Autoconf -*-
220
# Process this file with autoconf to produce a configure script.
321

‎src/Makefile.am‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
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
INCLUDES = -I../
220
METASOURCES = AUTO
321
lib_LTLIBRARIES = libhttpserver.la

‎src/java/Makefile‎

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ POST_INSTALL = :
3333
NORMAL_UNINSTALL = :
3434
PRE_UNINSTALL = :
3535
POST_UNINSTALL = :
36-
build_triplet = x86_64-unknown-linux-gnu
37-
host_triplet = x86_64-unknown-linux-gnu
36+
build_triplet = i686-pc-linux-gnu
37+
host_triplet = i686-pc-linux-gnu
3838
subdir = src/java
3939
DIST_COMMON = $(libjavasqi_la_include_HEADERS) $(srcdir)/Makefile.am \
4040
$(srcdir)/Makefile.in
@@ -94,13 +94,13 @@ HEADERS = $(libjavasqi_la_include_HEADERS)
9494
ETAGS = etags
9595
CTAGS = ctags
9696
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
97-
ACLOCAL = ${SHELL} /home/etr/progs/rw/libhttpserver/missing --run aclocal-1.11
98-
AMTAR = ${SHELL} /home/etr/progs/rw/libhttpserver/missing --run tar
97+
ACLOCAL = ${SHELL} /home/etr/progs/webserver_framework/trunk/missing --run aclocal-1.11
98+
AMTAR = ${SHELL} /home/etr/progs/webserver_framework/trunk/missing --run tar
9999
AR = ar
100-
AUTOCONF = ${SHELL} /home/etr/progs/rw/libhttpserver/missing --run autoconf
101-
AUTOHEADER = ${SHELL} /home/etr/progs/rw/libhttpserver/missing --run autoheader
102-
AUTOMAKE = ${SHELL} /home/etr/progs/rw/libhttpserver/missing --run automake-1.11
103-
AWK = gawk
100+
AUTOCONF = ${SHELL} /home/etr/progs/webserver_framework/trunk/missing --run autoconf
101+
AUTOHEADER = ${SHELL} /home/etr/progs/webserver_framework/trunk/missing --run autoheader
102+
AUTOMAKE = ${SHELL} /home/etr/progs/webserver_framework/trunk/missing --run automake-1.11
103+
AWK = mawk
104104
CC = gcc
105105
CCDEPMODE = depmode=gcc3
106106
CFLAGS = -g -O2
@@ -113,24 +113,23 @@ CXXFLAGS = -g -O2
113113
CYGPATH_W = echo
114114
DEFS = -DHAVE_CONFIG_H
115115
DEPDIR = .deps
116-
DLLTOOL = false
117116
DSYMUTIL =
118117
DUMPBIN =
119118
ECHO_C =
120119
ECHO_N = -n
121120
ECHO_T =
122-
EGREP = /usr/bin/grep -E
121+
EGREP = /bin/grep -E
123122
EXEEXT =
124123
EXT_LIBS =
125124
EXT_LIB_PATH =
126-
FGREP = /usr/bin/grep -F
127-
GREP = /usr/bin/grep
128-
INSTALL = /usr/bin/ginstall -c
125+
FGREP = /bin/grep -F
126+
GREP = /bin/grep
127+
INSTALL = /usr/bin/install -c
129128
INSTALL_DATA = ${INSTALL} -m 644
130129
INSTALL_PROGRAM = ${INSTALL}
131130
INSTALL_SCRIPT = ${INSTALL}
132131
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
133-
LD = /usr/x86_64-slackware-linux/bin/ld -m elf_x86_64
132+
LD = /usr/bin/ld
134133
LDFLAGS =
135134
LHT_LIBDEPS = -lmicrohttpd
136135
LIBOBJS =
@@ -139,9 +138,8 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool
139138
LIPO =
140139
LN_S = ln -s
141140
LTLIBOBJS =
142-
MAKEINFO = ${SHELL} /home/etr/progs/rw/libhttpserver/missing --run makeinfo
143-
MANIFEST_TOOL = :
144-
MKDIR_P = /usr/bin/mkdir -p
141+
MAKEINFO = ${SHELL} /home/etr/progs/webserver_framework/trunk/missing --run makeinfo
142+
MKDIR_P = /bin/mkdir -p
145143
NM = /usr/bin/nm -B
146144
NMEDIT =
147145
OBJDUMP = objdump
@@ -157,16 +155,15 @@ PACKAGE_URL =
157155
PACKAGE_VERSION = 0.1.1
158156
PATH_SEPARATOR = :
159157
RANLIB = ranlib
160-
SED = /usr/bin/sed
158+
SED = /bin/sed
161159
SET_MAKE =
162-
SHELL = /bin/sh
160+
SHELL = /bin/bash
163161
STRIP = strip
164162
VERSION = 0.1.1
165-
abs_builddir = /home/etr/progs/rw/libhttpserver/src/java
166-
abs_srcdir = /home/etr/progs/rw/libhttpserver/src/java
167-
abs_top_builddir = /home/etr/progs/rw/libhttpserver
168-
abs_top_srcdir = /home/etr/progs/rw/libhttpserver
169-
ac_ct_AR = ar
163+
abs_builddir = /home/etr/progs/webserver_framework/trunk/src/java
164+
abs_srcdir = /home/etr/progs/webserver_framework/trunk/src/java
165+
abs_top_builddir = /home/etr/progs/webserver_framework/trunk
166+
abs_top_srcdir = /home/etr/progs/webserver_framework/trunk
170167
ac_ct_CC = gcc
171168
ac_ct_CXX = g++
172169
ac_ct_DUMPBIN =
@@ -176,32 +173,33 @@ am__quote =
176173
am__tar = ${AMTAR} chof - "$$tardir"
177174
am__untar = ${AMTAR} xf -
178175
bindir = ${exec_prefix}/bin
179-
build = x86_64-unknown-linux-gnu
176+
build = i686-pc-linux-gnu
180177
build_alias =
181-
build_cpu = x86_64
178+
build_cpu = i686
182179
build_os = linux-gnu
183-
build_vendor = unknown
180+
build_vendor = pc
184181
builddir = .
185182
datadir = ${datarootdir}
186183
datarootdir = ${prefix}/share
187184
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
188185
dvidir = ${docdir}
189186
exec_prefix = ${prefix}
190-
host = x86_64-unknown-linux-gnu
187+
host = i686-pc-linux-gnu
191188
host_alias =
192-
host_cpu = x86_64
189+
host_cpu = i686
193190
host_os = linux-gnu
194-
host_vendor = unknown
191+
host_vendor = pc
195192
htmldir = ${docdir}
196193
includedir = ${prefix}/include
197194
infodir = ${datarootdir}/info
198-
install_sh = ${SHELL} /home/etr/progs/rw/libhttpserver/install-sh
195+
install_sh = ${SHELL} /home/etr/progs/webserver_framework/trunk/install-sh
199196
libdir = ${exec_prefix}/lib
200197
libexecdir = ${exec_prefix}/libexec
201198
localedir = ${datarootdir}/locale
202199
localstatedir = ${prefix}/var
200+
lt_ECHO = echo
203201
mandir = ${datarootdir}/man
204-
mkdir_p = /usr/bin/mkdir -p
202+
mkdir_p = /bin/mkdir -p
205203
oldincludedir = /usr/include
206204
pdfdir = ${docdir}
207205
prefix = /usr/local

‎src/java/Makefile.in‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ CXXFLAGS = @CXXFLAGS@
113113
CYGPATH_W = @CYGPATH_W@
114114
DEFS = @DEFS@
115115
DEPDIR = @DEPDIR@
116-
DLLTOOL = @DLLTOOL@
117116
DSYMUTIL = @DSYMUTIL@
118117
DUMPBIN = @DUMPBIN@
119118
ECHO_C = @ECHO_C@
@@ -140,7 +139,6 @@ LIPO = @LIPO@
140139
LN_S = @LN_S@
141140
LTLIBOBJS = @LTLIBOBJS@
142141
MAKEINFO = @MAKEINFO@
143-
MANIFEST_TOOL = @MANIFEST_TOOL@
144142
MKDIR_P = @MKDIR_P@
145143
NM = @NM@
146144
NMEDIT = @NMEDIT@
@@ -166,7 +164,6 @@ abs_builddir = @abs_builddir@
166164
abs_srcdir = @abs_srcdir@
167165
abs_top_builddir = @abs_top_builddir@
168166
abs_top_srcdir = @abs_top_srcdir@
169-
ac_ct_AR = @ac_ct_AR@
170167
ac_ct_CC = @ac_ct_CC@
171168
ac_ct_CXX = @ac_ct_CXX@
172169
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -200,6 +197,7 @@ libdir = @libdir@
200197
libexecdir = @libexecdir@
201198
localedir = @localedir@
202199
localstatedir = @localstatedir@
200+
lt_ECHO = @lt_ECHO@
203201
mandir = @mandir@
204202
mkdir_p = @mkdir_p@
205203
oldincludedir = @oldincludedir@

‎src/php/Makefile‎

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ POST_INSTALL = :
3333
NORMAL_UNINSTALL = :
3434
PRE_UNINSTALL = :
3535
POST_UNINSTALL = :
36-
build_triplet = x86_64-unknown-linux-gnu
37-
host_triplet = x86_64-unknown-linux-gnu
36+
build_triplet = i686-pc-linux-gnu
37+
host_triplet = i686-pc-linux-gnu
3838
subdir = src/php
3939
DIST_COMMON = $(libphpwebserver_framework_la_include_HEADERS) \
4040
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -94,13 +94,13 @@ HEADERS = $(libphpwebserver_framework_la_include_HEADERS)
9494
ETAGS = etags
9595
CTAGS = ctags
9696
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
97-
ACLOCAL = ${SHELL} /home/etr/progs/rw/libhttpserver/missing --run aclocal-1.11
98-
AMTAR = ${SHELL} /home/etr/progs/rw/libhttpserver/missing --run tar
97+
ACLOCAL = ${SHELL} /home/etr/progs/webserver_framework/trunk/missing --run aclocal-1.11
98+
AMTAR = ${SHELL} /home/etr/progs/webserver_framework/trunk/missing --run tar
9999
AR = ar
100-
AUTOCONF = ${SHELL} /home/etr/progs/rw/libhttpserver/missing --run autoconf
101-
AUTOHEADER = ${SHELL} /home/etr/progs/rw/libhttpserver/missing --run autoheader
102-
AUTOMAKE = ${SHELL} /home/etr/progs/rw/libhttpserver/missing --run automake-1.11
103-
AWK = gawk
100+
AUTOCONF = ${SHELL} /home/etr/progs/webserver_framework/trunk/missing --run autoconf
101+
AUTOHEADER = ${SHELL} /home/etr/progs/webserver_framework/trunk/missing --run autoheader
102+
AUTOMAKE = ${SHELL} /home/etr/progs/webserver_framework/trunk/missing --run automake-1.11
103+
AWK = mawk
104104
CC = gcc
105105
CCDEPMODE = depmode=gcc3
106106
CFLAGS = -g -O2
@@ -113,24 +113,23 @@ CXXFLAGS = -g -O2
113113
CYGPATH_W = echo
114114
DEFS = -DHAVE_CONFIG_H
115115
DEPDIR = .deps
116-
DLLTOOL = false
117116
DSYMUTIL =
118117
DUMPBIN =
119118
ECHO_C =
120119
ECHO_N = -n
121120
ECHO_T =
122-
EGREP = /usr/bin/grep -E
121+
EGREP = /bin/grep -E
123122
EXEEXT =
124123
EXT_LIBS =
125124
EXT_LIB_PATH =
126-
FGREP = /usr/bin/grep -F
127-
GREP = /usr/bin/grep
128-
INSTALL = /usr/bin/ginstall -c
125+
FGREP = /bin/grep -F
126+
GREP = /bin/grep
127+
INSTALL = /usr/bin/install -c
129128
INSTALL_DATA = ${INSTALL} -m 644
130129
INSTALL_PROGRAM = ${INSTALL}
131130
INSTALL_SCRIPT = ${INSTALL}
132131
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
133-
LD = /usr/x86_64-slackware-linux/bin/ld -m elf_x86_64
132+
LD = /usr/bin/ld
134133
LDFLAGS =
135134
LHT_LIBDEPS = -lmicrohttpd
136135
LIBOBJS =
@@ -139,9 +138,8 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool
139138
LIPO =
140139
LN_S = ln -s
141140
LTLIBOBJS =
142-
MAKEINFO = ${SHELL} /home/etr/progs/rw/libhttpserver/missing --run makeinfo
143-
MANIFEST_TOOL = :
144-
MKDIR_P = /usr/bin/mkdir -p
141+
MAKEINFO = ${SHELL} /home/etr/progs/webserver_framework/trunk/missing --run makeinfo
142+
MKDIR_P = /bin/mkdir -p
145143
NM = /usr/bin/nm -B
146144
NMEDIT =
147145
OBJDUMP = objdump
@@ -157,16 +155,15 @@ PACKAGE_URL =
157155
PACKAGE_VERSION = 0.1.1
158156
PATH_SEPARATOR = :
159157
RANLIB = ranlib
160-
SED = /usr/bin/sed
158+
SED = /bin/sed
161159
SET_MAKE =
162-
SHELL = /bin/sh
160+
SHELL = /bin/bash
163161
STRIP = strip
164162
VERSION = 0.1.1
165-
abs_builddir = /home/etr/progs/rw/libhttpserver/src/php
166-
abs_srcdir = /home/etr/progs/rw/libhttpserver/src/php
167-
abs_top_builddir = /home/etr/progs/rw/libhttpserver
168-
abs_top_srcdir = /home/etr/progs/rw/libhttpserver
169-
ac_ct_AR = ar
163+
abs_builddir = /home/etr/progs/webserver_framework/trunk/src/php
164+
abs_srcdir = /home/etr/progs/webserver_framework/trunk/src/php
165+
abs_top_builddir = /home/etr/progs/webserver_framework/trunk
166+
abs_top_srcdir = /home/etr/progs/webserver_framework/trunk
170167
ac_ct_CC = gcc
171168
ac_ct_CXX = g++
172169
ac_ct_DUMPBIN =
@@ -176,32 +173,33 @@ am__quote =
176173
am__tar = ${AMTAR} chof - "$$tardir"
177174
am__untar = ${AMTAR} xf -
178175
bindir = ${exec_prefix}/bin
179-
build = x86_64-unknown-linux-gnu
176+
build = i686-pc-linux-gnu
180177
build_alias =
181-
build_cpu = x86_64
178+
build_cpu = i686
182179
build_os = linux-gnu
183-
build_vendor = unknown
180+
build_vendor = pc
184181
builddir = .
185182
datadir = ${datarootdir}
186183
datarootdir = ${prefix}/share
187184
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
188185
dvidir = ${docdir}
189186
exec_prefix = ${prefix}
190-
host = x86_64-unknown-linux-gnu
187+
host = i686-pc-linux-gnu
191188
host_alias =
192-
host_cpu = x86_64
189+
host_cpu = i686
193190
host_os = linux-gnu
194-
host_vendor = unknown
191+
host_vendor = pc
195192
htmldir = ${docdir}
196193
includedir = ${prefix}/include
197194
infodir = ${datarootdir}/info
198-
install_sh = ${SHELL} /home/etr/progs/rw/libhttpserver/install-sh
195+
install_sh = ${SHELL} /home/etr/progs/webserver_framework/trunk/install-sh
199196
libdir = ${exec_prefix}/lib
200197
libexecdir = ${exec_prefix}/libexec
201198
localedir = ${datarootdir}/locale
202199
localstatedir = ${prefix}/var
200+
lt_ECHO = echo
203201
mandir = ${datarootdir}/man
204-
mkdir_p = /usr/bin/mkdir -p
202+
mkdir_p = /bin/mkdir -p
205203
oldincludedir = /usr/include
206204
pdfdir = ${docdir}
207205
prefix = /usr/local

0 commit comments

Comments
 (0)