Skip to content

Commit 2640c3a

Browse files
author
Sebastiano Merlino
committed
Changed in order to solve some problems with deb package and rpm package
1 parent cf98012 commit 2640c3a

File tree

5 files changed

+31
-17
lines changed

5 files changed

+31
-17
lines changed

‎Makefile.am‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ AUTOMAKE_OPTIONS = foreign 1.4
2525
ACLOCAL_AMFLAGS = -I m4
2626

2727
SUBDIRS = src $(PYTHON_DIR) $(JAVA_DIR) $(PHP_DIR) $(LUA_DIR) $(PERL_DIR) $(RUBY_DIR) $(GUILE_DIR)
28-
DIST_SUBDIRS = $(SUBDIRS)
28+
DIST_SUBDIRS = src $(PYTHON_DIST_DIR) $(JAVA_DIST_DIR) $(PHP_DIST_DIR) $(LUA_DIST_DIR) $(PERL_DIST_DIR) $(RUBY_DIST_DIR) $(GUILE_DIST_DIR)
2929
EXTRA_DIST = libhttpserver.pc.in debian/changelog.in debian/control.in debian/rules.in debian/libhttpserver-dev.install.in debian/libhttpserver.install.in redhat/libhttpserver.SPEC.in $(DX_CONFIG) $(PYTHON_EXTRA) $(PHP_EXTRA) $(PERL_EXTRA)
3030

3131
MOSTLYCLEANFILES = $(DX_CLEANFILES) redhat/SOURCES/* $(top_srcdir)/src/java/*.java $(top_srcdir)/src/java/webserver_wrap.*
@@ -34,35 +34,42 @@ DISTCLEANFILES = redhat/SOURCES/* redhat/SPEC/* redhat/* debian/* DIST_REVISION
3434
pkgconfigdir = $(libdir)/pkgconfig
3535
pkgconfig_DATA = libhttpserver.pc
3636

37+
PYTHON_DIST_DIR = src/python
3738
if PYTHON
38-
PYTHON_DIR = src/python
39+
PYTHON_DIR = $(PYTHON_DIST_DIR)
3940
PYTHON_EXTRA = src/python/libhttpserver_python.py
4041
endif
4142

43+
JAVA_DIST_DIR = src/java
4244
if JAVA
43-
JAVA_DIR = src/java
45+
JAVA_DIR = $(JAVA_DIST_DIR)
4446
endif
4547

48+
PHP_DIST_DIR = src/php
4649
if PHP
47-
PHP_DIR = src/php
50+
PHP_DIR = $(PHP_DIST_DIR)
4851
PHP_EXTRA = src/php/libhttpserver_php.php
4952
endif
5053

54+
LUA_DIST_DIR = src/lua
5155
if LUA
52-
LUA_DIR = src/lua
56+
LUA_DIR = $(LUA_DIST_DIR)
5357
endif
5458

59+
PERL_DIST_DIR = src/perl
5560
if PERL
56-
PERL_DIR = src/perl
61+
PERL_DIR = $(PERL_DIST_DIR)
5762
PERL_EXTRA = src/php/libhttpserver_perl.pm
5863
endif
5964

65+
RUBY_DIST_DIR = src/ruby
6066
if RUBY
61-
RUBY_DIR = src/ruby
67+
RUBY_DIR = $(RUBY_DIST_DIR)
6268
endif
6369

70+
GUILE_DIST_DIR = src/guile
6471
if GUILE
65-
GUILE_DIR = src/guile
72+
GUILE_DIR = $(GUILE_DIST_DIR)
6673
endif
6774

6875
include $(top_srcdir)/aminclude.am

‎configure.ac‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -240,10 +240,10 @@ if test x$python = xtrue; then
240240
AC_SUBST(PYLDFLAGS)
241241
AC_SUBST(PYLIBS)
242242
AC_SUBST_FILE([PYTHON_AUTOGENERATION])
243-
PYTHON_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
244243
LANGUAGES="$LANGUAGES Python"
245244
OUTPUT_LANG="$OUTPUT_LANG src/python/Makefile"
246245
fi
246+
PYTHON_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
247247

248248
if test x$java = xtrue; then
249249
JAVAINCLUDES=""
@@ -271,10 +271,10 @@ if test x$java = xtrue; then
271271
AC_SUBST(JAVALDFLAGS)
272272
AC_SUBST(JABALIBS)
273273
AC_SUBST_FILE([JAVA_AUTOGENERATION])
274-
JAVA_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
275274
LANGUAGES="$LANGUAGES Java"
276275
OUTPUT_LANG="$OUTPUT_LANG src/java/Makefile"
277276
fi
277+
JAVA_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
278278

279279
if test x$php = xtrue; then
280280
AC_CHECK_PROG([PHPCONFIG],[php-config],["yes"], ["no"])
@@ -287,10 +287,10 @@ if test x$php = xtrue; then
287287
AC_SUBST(PHPINCLUDES)
288288
AC_SUBST(PHPLDFLAGS)
289289
AC_SUBST_FILE([PHP_AUTOGENERATION])
290-
PHP_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
291290
LANGUAGES="$LANGUAGES PHP"
292291
OUTPUT_LANG="$OUTPUT_LANG src/php/Makefile"
293292
fi
293+
PHP_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
294294

295295
if test x$lua = xtrue; then
296296
LUAINCLUDES=""
@@ -314,10 +314,10 @@ if test x$lua = xtrue; then
314314
fi
315315
AC_SUBST(LUAINCLUDES)
316316
AC_SUBST_FILE([LUA_AUTOGENERATION])
317-
LUA_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
318317
LANGUAGES="$LANGUAGES LUA"
319318
OUTPUT_LANG="$OUTPUT_LANG src/lua/Makefile"
320319
fi
320+
LUA_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
321321

322322
if test x$perl = xtrue; then
323323
AC_CHECK_PROG([PERLINT],[perl],["yes"], ["no"])
@@ -330,10 +330,10 @@ if test x$perl = xtrue; then
330330
AC_SUBST(PERLINCLUDES)
331331
AC_SUBST(PERLDEFINES)
332332
AC_SUBST_FILE([PERL_AUTOGENERATION])
333-
PERL_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
334333
LANGUAGES="$LANGUAGES Perl"
335334
OUTPUT_LANG="$OUTPUT_LANG src/perl/Makefile"
336335
fi
336+
PERL_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
337337

338338
if test x$ruby = xtrue; then
339339
AC_CHECK_PROG([RUBYINT],[ruby],["yes"], ["no"])
@@ -361,10 +361,10 @@ if test x$ruby = xtrue; then
361361
AC_SUBST(RUBYINCLUDES)
362362
AC_SUBST(RUBYDEFINES)
363363
AC_SUBST_FILE([RUBY_AUTOGENERATION])
364-
RUBY_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
365364
LANGUAGES="$LANGUAGES Ruby"
366365
OUTPUT_LANG="$OUTPUT_LANG src/ruby/Makefile"
367366
fi
367+
RUBY_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
368368

369369
if test x$guile = xtrue; then
370370
AC_CHECK_PROG([GUILEINT],[guile],["yes"], ["no"])
@@ -373,10 +373,10 @@ if test x$guile = xtrue; then
373373
AC_MSG_ERROR(guile interpreter not found)
374374
fi
375375
AC_SUBST_FILE([GUILE_AUTOGENERATION])
376-
GUILE_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
377376
LANGUAGES="$LANGUAGES Guile"
378377
OUTPUT_LANG="$OUTPUT_LANG src/guile/Makefile"
379378
fi
379+
GUILE_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
380380

381381
AC_SUBST(LHT_LIBDEPS)
382382
AC_SUBST(AM_CXXFLAGS)

‎debian/changelog.in‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
libhttpserver (0.2.0) unstable; urgency=low
2+
3+
* Deb target now seems to work really
4+
* Rpm target added
5+
6+
-- Sebastiano Merlino <electrictwister2000@gmail.com> Wed, 25 Jul 2012 17:05:11 +0200
7+
18
libhttpserver (0.1.2) unstable; urgency=low
29

310
* Added deb target to makefile.

‎src/guile/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ INCLUDES = -I../ -I$(top_srcdir)/src -I$(top_srcdir)/src/httpserver
2020
METASOURCES = AUTO
2121
lib_LTLIBRARIES = libhttpserver_guile.la
2222
libhttpserver_guile_la_LIBADD = -lmicrohttpd
23-
libhttpserver_guile_la_SOURCES = WebserverWrap.cpp $(top_srcdir)/src/Webserver.cpp $(top_srcdir)/src/HttpUtils.cpp $(top_srcdir)/src/HttpEndpoint.cpp $(top_srcdir)/src/HttpResource.cpp $(top_srcdir)/src/HttpRequest.cpp $(top_srcdir)/src/HttpResponse.cpp $(top_srcdir)/src/string_utilities.cpp
23+
libhttpserver_guile_la_SOURCES = webserver_wrap.cpp $(top_srcdir)/src/webserver.cpp $(top_srcdir)/src/http_utils.cpp $(top_srcdir)/src/http_endpoint.cpp $(top_srcdir)/src/http_resource.cpp $(top_srcdir)/src/http_request.cpp $(top_srcdir)/src/http_response.cpp $(top_srcdir)/src/string_utilities.cpp
2424
libhttpserver_guile_la_includedir =
2525
libhttpserver_guile_la_include_HEADERS =
2626

‎src/php/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ libhttpserver_php_la_include_HEADERS = libhttpserver_php.php
2727

2828
language=php
2929
swigoptions=-Wall
30-
swigscripts=
30+
swigscripts=libhttpserver_php.php
3131
@PHP_AUTOGENERATION@

0 commit comments

Comments
 (0)