Skip to content

Commit 4b09967

Browse files
author
Sebastiano Merlino
committed
Adjusted Makefile.am
1 parent ac2d969 commit 4b09967

File tree

4 files changed

+117
-102
lines changed

4 files changed

+117
-102
lines changed

‎Makefile.am‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
1-
INCLUDES = -I../
2-
METASOURCES = AUTO
3-
lib_LTLIBRARIES = libhttpserver.la
4-
libhttpserver_la_SOURCES = string_utilities.cpp Webserver.cpp HttpUtils.cpp
5-
noinst_HEADERS = string_utilities.hpp
6-
include_HEADERS = Webserver.hpp HttpUtils.hpp
7-
AM_CXXFLAGS = -fPIC -Wall
8-
libhttpserver_la_LIBADD = -lmicrohttpd
9-
libhttpserver_la_LDFLAGS =
1+
# not a GNU package. You can remove this line, if
2+
# have all needed files, that a GNU package needs
3+
AUTOMAKE_OPTIONS = foreign 1.4
4+
5+
SUBDIRS = src $(PYTHON_DIR) $(JAVA_DIR) $(PHP_DIR)
6+
DIST_SUBDIRS = src $(PYTHON_DIR) $(JAVA_DIR) $(PHP_DIR)
7+
8+
if PYTHON
9+
PYTHON_DIR = src/python
10+
endif
11+
12+
if JAVA
13+
JAVA_DIR = src/java
14+
endif
15+
16+
if PHP
17+
PHP_DIR = src/php
18+
endif

‎src/java/Makefile‎

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ POST_INSTALL = :
3333
NORMAL_UNINSTALL = :
3434
PRE_UNINSTALL = :
3535
POST_UNINSTALL = :
36-
build_triplet = i686-pc-linux-gnu
37-
host_triplet = i686-pc-linux-gnu
36+
build_triplet = x86_64-unknown-linux-gnu
37+
host_triplet = x86_64-unknown-linux-gnu
3838
subdir = src/java
3939
DIST_COMMON = $(libjavasqi_la_include_HEADERS) $(srcdir)/Makefile.am \
4040
$(srcdir)/Makefile.in
4141
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
4242
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
4343
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
4444
$(ACLOCAL_M4)
45-
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
45+
mkinstalldirs = $(install_sh) -d
4646
CONFIG_HEADER = $(top_builddir)/config.h
4747
CONFIG_CLEAN_FILES =
4848
CONFIG_CLEAN_VPATH_FILES =
@@ -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/webserver_framework/trunk/missing --run aclocal-1.11
98-
AMTAR = ${SHELL} /home/etr/progs/webserver_framework/trunk/missing --run tar
97+
ACLOCAL = ${SHELL} /home/etr/progs/rw/libhttpserver/missing --run aclocal-1.11
98+
AMTAR = ${SHELL} /home/etr/progs/rw/libhttpserver/missing --run tar
9999
AR = ar
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
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
104104
CC = gcc
105105
CCDEPMODE = depmode=gcc3
106106
CFLAGS = -g -O2
@@ -113,30 +113,32 @@ CXXFLAGS = -g -O2
113113
CYGPATH_W = echo
114114
DEFS = -DHAVE_CONFIG_H
115115
DEPDIR = .deps
116+
DLLTOOL = false
116117
DSYMUTIL =
117118
DUMPBIN =
118119
ECHO_C =
119120
ECHO_N = -n
120121
ECHO_T =
121-
EGREP = /bin/grep -E
122+
EGREP = /usr/bin/grep -E
122123
EXEEXT =
123-
FGREP = /bin/grep -F
124-
GREP = /bin/grep
125-
INSTALL = /usr/bin/install -c
124+
FGREP = /usr/bin/grep -F
125+
GREP = /usr/bin/grep
126+
INSTALL = /usr/bin/ginstall -c
126127
INSTALL_DATA = ${INSTALL} -m 644
127128
INSTALL_PROGRAM = ${INSTALL}
128129
INSTALL_SCRIPT = ${INSTALL}
129130
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
130-
LD = /usr/bin/ld
131+
LD = /usr/x86_64-slackware-linux/bin/ld -m elf_x86_64
131132
LDFLAGS =
132133
LIBOBJS =
133134
LIBS =
134135
LIBTOOL = $(SHELL) $(top_builddir)/libtool
135136
LIPO =
136137
LN_S = ln -s
137138
LTLIBOBJS =
138-
MAKEINFO = ${SHELL} /home/etr/progs/webserver_framework/trunk/missing --run makeinfo
139-
MKDIR_P = /bin/mkdir -p
139+
MAKEINFO = ${SHELL} /home/etr/progs/rw/libhttpserver/missing --run makeinfo
140+
MANIFEST_TOOL = :
141+
MKDIR_P = /usr/bin/mkdir -p
140142
NM = /usr/bin/nm -B
141143
NMEDIT =
142144
OBJDUMP = objdump
@@ -152,15 +154,16 @@ PACKAGE_URL =
152154
PACKAGE_VERSION = VERSION
153155
PATH_SEPARATOR = :
154156
RANLIB = ranlib
155-
SED = /bin/sed
157+
SED = /usr/bin/sed
156158
SET_MAKE =
157-
SHELL = /bin/bash
159+
SHELL = /bin/sh
158160
STRIP = strip
159161
VERSION = VERSION
160-
abs_builddir = /home/etr/progs/webserver_framework/trunk/src/java
161-
abs_srcdir = /home/etr/progs/webserver_framework/trunk/src/java
162-
abs_top_builddir = /home/etr/progs/webserver_framework/trunk
163-
abs_top_srcdir = /home/etr/progs/webserver_framework/trunk
162+
abs_builddir = /home/etr/progs/rw/libhttpserver/src/java
163+
abs_srcdir = /home/etr/progs/rw/libhttpserver/src/java
164+
abs_top_builddir = /home/etr/progs/rw/libhttpserver
165+
abs_top_srcdir = /home/etr/progs/rw/libhttpserver
166+
ac_ct_AR = ar
164167
ac_ct_CC = gcc
165168
ac_ct_CXX = g++
166169
ac_ct_DUMPBIN =
@@ -170,33 +173,32 @@ am__quote =
170173
am__tar = ${AMTAR} chof - "$$tardir"
171174
am__untar = ${AMTAR} xf -
172175
bindir = ${exec_prefix}/bin
173-
build = i686-pc-linux-gnu
176+
build = x86_64-unknown-linux-gnu
174177
build_alias =
175-
build_cpu = i686
178+
build_cpu = x86_64
176179
build_os = linux-gnu
177-
build_vendor = pc
180+
build_vendor = unknown
178181
builddir = .
179182
datadir = ${datarootdir}
180183
datarootdir = ${prefix}/share
181184
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
182185
dvidir = ${docdir}
183186
exec_prefix = ${prefix}
184-
host = i686-pc-linux-gnu
187+
host = x86_64-unknown-linux-gnu
185188
host_alias =
186-
host_cpu = i686
189+
host_cpu = x86_64
187190
host_os = linux-gnu
188-
host_vendor = pc
191+
host_vendor = unknown
189192
htmldir = ${docdir}
190193
includedir = ${prefix}/include
191194
infodir = ${datarootdir}/info
192-
install_sh = ${SHELL} /home/etr/progs/webserver_framework/trunk/install-sh
195+
install_sh = ${SHELL} /home/etr/progs/rw/libhttpserver/install-sh
193196
libdir = ${exec_prefix}/lib
194197
libexecdir = ${exec_prefix}/libexec
195198
localedir = ${datarootdir}/locale
196199
localstatedir = ${prefix}/var
197-
lt_ECHO = echo
198200
mandir = ${datarootdir}/man
199-
mkdir_p = /bin/mkdir -p
201+
mkdir_p = /usr/bin/mkdir -p
200202
oldincludedir = /usr/include
201203
pdfdir = ${docdir}
202204
prefix = /usr/local

‎src/php/Makefile‎

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ POST_INSTALL = :
3333
NORMAL_UNINSTALL = :
3434
PRE_UNINSTALL = :
3535
POST_UNINSTALL = :
36-
build_triplet = i686-pc-linux-gnu
37-
host_triplet = i686-pc-linux-gnu
36+
build_triplet = x86_64-unknown-linux-gnu
37+
host_triplet = x86_64-unknown-linux-gnu
3838
subdir = src/php
3939
DIST_COMMON = $(libphpwebserver_framework_la_include_HEADERS) \
4040
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
4141
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
4242
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
4343
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
4444
$(ACLOCAL_M4)
45-
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
45+
mkinstalldirs = $(install_sh) -d
4646
CONFIG_HEADER = $(top_builddir)/config.h
4747
CONFIG_CLEAN_FILES =
4848
CONFIG_CLEAN_VPATH_FILES =
@@ -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/webserver_framework/trunk/missing --run aclocal-1.11
98-
AMTAR = ${SHELL} /home/etr/progs/webserver_framework/trunk/missing --run tar
97+
ACLOCAL = ${SHELL} /home/etr/progs/rw/libhttpserver/missing --run aclocal-1.11
98+
AMTAR = ${SHELL} /home/etr/progs/rw/libhttpserver/missing --run tar
9999
AR = ar
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
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
104104
CC = gcc
105105
CCDEPMODE = depmode=gcc3
106106
CFLAGS = -g -O2
@@ -113,30 +113,32 @@ CXXFLAGS = -g -O2
113113
CYGPATH_W = echo
114114
DEFS = -DHAVE_CONFIG_H
115115
DEPDIR = .deps
116+
DLLTOOL = false
116117
DSYMUTIL =
117118
DUMPBIN =
118119
ECHO_C =
119120
ECHO_N = -n
120121
ECHO_T =
121-
EGREP = /bin/grep -E
122+
EGREP = /usr/bin/grep -E
122123
EXEEXT =
123-
FGREP = /bin/grep -F
124-
GREP = /bin/grep
125-
INSTALL = /usr/bin/install -c
124+
FGREP = /usr/bin/grep -F
125+
GREP = /usr/bin/grep
126+
INSTALL = /usr/bin/ginstall -c
126127
INSTALL_DATA = ${INSTALL} -m 644
127128
INSTALL_PROGRAM = ${INSTALL}
128129
INSTALL_SCRIPT = ${INSTALL}
129130
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
130-
LD = /usr/bin/ld
131+
LD = /usr/x86_64-slackware-linux/bin/ld -m elf_x86_64
131132
LDFLAGS =
132133
LIBOBJS =
133134
LIBS =
134135
LIBTOOL = $(SHELL) $(top_builddir)/libtool
135136
LIPO =
136137
LN_S = ln -s
137138
LTLIBOBJS =
138-
MAKEINFO = ${SHELL} /home/etr/progs/webserver_framework/trunk/missing --run makeinfo
139-
MKDIR_P = /bin/mkdir -p
139+
MAKEINFO = ${SHELL} /home/etr/progs/rw/libhttpserver/missing --run makeinfo
140+
MANIFEST_TOOL = :
141+
MKDIR_P = /usr/bin/mkdir -p
140142
NM = /usr/bin/nm -B
141143
NMEDIT =
142144
OBJDUMP = objdump
@@ -152,15 +154,16 @@ PACKAGE_URL =
152154
PACKAGE_VERSION = VERSION
153155
PATH_SEPARATOR = :
154156
RANLIB = ranlib
155-
SED = /bin/sed
157+
SED = /usr/bin/sed
156158
SET_MAKE =
157-
SHELL = /bin/bash
159+
SHELL = /bin/sh
158160
STRIP = strip
159161
VERSION = VERSION
160-
abs_builddir = /home/etr/progs/webserver_framework/trunk/src/php
161-
abs_srcdir = /home/etr/progs/webserver_framework/trunk/src/php
162-
abs_top_builddir = /home/etr/progs/webserver_framework/trunk
163-
abs_top_srcdir = /home/etr/progs/webserver_framework/trunk
162+
abs_builddir = /home/etr/progs/rw/libhttpserver/src/php
163+
abs_srcdir = /home/etr/progs/rw/libhttpserver/src/php
164+
abs_top_builddir = /home/etr/progs/rw/libhttpserver
165+
abs_top_srcdir = /home/etr/progs/rw/libhttpserver
166+
ac_ct_AR = ar
164167
ac_ct_CC = gcc
165168
ac_ct_CXX = g++
166169
ac_ct_DUMPBIN =
@@ -170,33 +173,32 @@ am__quote =
170173
am__tar = ${AMTAR} chof - "$$tardir"
171174
am__untar = ${AMTAR} xf -
172175
bindir = ${exec_prefix}/bin
173-
build = i686-pc-linux-gnu
176+
build = x86_64-unknown-linux-gnu
174177
build_alias =
175-
build_cpu = i686
178+
build_cpu = x86_64
176179
build_os = linux-gnu
177-
build_vendor = pc
180+
build_vendor = unknown
178181
builddir = .
179182
datadir = ${datarootdir}
180183
datarootdir = ${prefix}/share
181184
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
182185
dvidir = ${docdir}
183186
exec_prefix = ${prefix}
184-
host = i686-pc-linux-gnu
187+
host = x86_64-unknown-linux-gnu
185188
host_alias =
186-
host_cpu = i686
189+
host_cpu = x86_64
187190
host_os = linux-gnu
188-
host_vendor = pc
191+
host_vendor = unknown
189192
htmldir = ${docdir}
190193
includedir = ${prefix}/include
191194
infodir = ${datarootdir}/info
192-
install_sh = ${SHELL} /home/etr/progs/webserver_framework/trunk/install-sh
195+
install_sh = ${SHELL} /home/etr/progs/rw/libhttpserver/install-sh
193196
libdir = ${exec_prefix}/lib
194197
libexecdir = ${exec_prefix}/libexec
195198
localedir = ${datarootdir}/locale
196199
localstatedir = ${prefix}/var
197-
lt_ECHO = echo
198200
mandir = ${datarootdir}/man
199-
mkdir_p = /bin/mkdir -p
201+
mkdir_p = /usr/bin/mkdir -p
200202
oldincludedir = /usr/include
201203
pdfdir = ${docdir}
202204
prefix = /usr/local

0 commit comments

Comments
 (0)