Skip to content

Commit dcbedd0

Browse files
alanxzalanxz
committed
FIX: bring autotools build system up to date
Remove the amqp_framing.c/.h regeneration logic as it breaks make dist. Bring the EXTRA_DIST list up to date with whats in the repo
1 parent 8554733 commit dcbedd0

File tree

2 files changed

+61
-136
lines changed

2 files changed

+61
-136
lines changed

‎Makefile.am‎

Lines changed: 60 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,44 @@
11
# vim:set ts=2 sw=2 sts=2 noet:
22
ACLOCAL_AMFLAGS = -I m4
33

4-
if REGENERATE_AMQP_FRAMING
5-
amqp_framing_dir = $(top_builddir)/librabbitmq/gen
6-
AM_CFLAGS = -I$(amqp_framing_dir) -I$(top_srcdir)/librabbitmq
7-
else
84
AM_CFLAGS = -I$(top_srcdir)/librabbitmq
9-
endif #REGENERATE_AMQP_FRAMING
10-
115

126
lib_LTLIBRARIES = librabbitmq/librabbitmq.la
137

8+
librabbitmq_librabbitmq_la_CFLAGS = \
9+
$(SSL_CFLAGS) \
10+
$(AM_CFLAGS)
11+
12+
librabbitmq_librabbitmq_la_LDFLAGS = \
13+
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
14+
$(NO_UNDEFINED) \
15+
$(SSL_LIBS)
16+
17+
include_HEADERS = \
18+
librabbitmq/amqp.h \
19+
librabbitmq/amqp_framing.h \
20+
librabbitmq/amqp_tcp_socket.h
21+
22+
if SSL
23+
include_HEADERS += librabbitmq/amqp_ssl_socket.h
24+
endif
25+
1426
librabbitmq_librabbitmq_la_SOURCES = \
15-
librabbitmq/amqp-socket.h \
16-
librabbitmq/amqp_tcp_socket.c \
1727
librabbitmq/amqp_api.c \
1828
librabbitmq/amqp_connection.c \
29+
librabbitmq/amqp_consumer.c \
30+
librabbitmq/amqp_framing.c \
1931
librabbitmq/amqp_mem.c \
2032
librabbitmq/amqp_private.h \
2133
librabbitmq/amqp_socket.c \
34+
librabbitmq/amqp_socket.h \
2235
librabbitmq/amqp_table.c \
23-
librabbitmq/amqp_url.c \
24-
librabbitmq/amqp_timer.h \
36+
librabbitmq/amqp_tcp_socket.c \
37+
librabbitmq/amqp_tcp_socket.h \
2538
librabbitmq/amqp_timer.c \
26-
librabbitmq/amqp_consumer.c
39+
librabbitmq/amqp_timer.h \
40+
librabbitmq/amqp_url.c
2741

28-
if REGENERATE_AMQP_FRAMING
29-
librabbitmq_librabbitmq_la_SOURCES += librabbitmq/gen/amqp_framing.c
30-
else
31-
librabbitmq_librabbitmq_la_SOURCES += librabbitmq/amqp_framing.c
32-
endif
3342

3443
if SSL_CYASSL
3544
librabbitmq_librabbitmq_la_SOURCES += librabbitmq/amqp_cyassl.c
@@ -47,79 +56,18 @@ if SSL_POLARSSL
4756
librabbitmq_librabbitmq_la_SOURCES += librabbitmq/amqp_polarssl.c
4857
endif
4958

50-
librabbitmq_librabbitmq_la_CFLAGS = \
51-
-I$(top_srcdir)/librabbitmq \
52-
$(SSL_CFLAGS) \
53-
$(AM_CFLAGS)
54-
55-
librabbitmq_librabbitmq_la_LDFLAGS = \
56-
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
57-
$(NO_UNDEFINED) \
58-
$(SSL_LIBS)
59-
6059
if OS_UNIX
6160
librabbitmq_librabbitmq_la_SOURCES += librabbitmq/unix/threads.h
6261
librabbitmq_librabbitmq_la_CFLAGS += -I$(top_srcdir)/librabbitmq/unix
6362
endif
6463

6564
if OS_WIN32
6665
librabbitmq_librabbitmq_la_SOURCES += librabbitmq/win32/threads.h
67-
librabbitmq_librabbitmq_la_CFLAGS += -I$(top_srcdir)/librabbitmq/win32
68-
librabbitmq_librabbitmq_la_CFLAGS += -I$(top_srcdir)/librabbitmq/win32/msinttypes
66+
librabbitmq_librabbitmq_la_CFLAGS += \
67+
-I$(top_srcdir)/librabbitmq/win32 \
68+
-I$(top_srcdir)/librabbitmq/win32/msinttypes
6969
endif
7070

71-
include_HEADERS = \
72-
$(top_srcdir)/librabbitmq/amqp.h \
73-
$(top_builddir)/librabbitmq/amqp_tcp_socket.h
74-
75-
if SSL
76-
include_HEADERS += librabbitmq/amqp_ssl_socket.h
77-
endif
78-
79-
if REGENERATE_AMQP_FRAMING
80-
81-
if PYTHON3
82-
codegen_py = $(top_builddir)/librabbitmq/python3/codegen3.py
83-
codegenlib_py = $(top_builddir)/librabbitmq/python3/amqp_codegen.py
84-
codegenlib_path = $(top_builddir)/librabbitmq/python3
85-
86-
$(codegenlib_path):
87-
$(AM_V_at)$(MKDIR_P) $@
88-
89-
$(codegen_py): $(top_srcdir)/librabbitmq/codegen.py $(codegenlib_path)
90-
$(AM_V_GEN)$(PYTHON2TO3) $(top_srcdir)/librabbitmq/codegen.py | patch -p0 -o $(codegen_py)
91-
92-
$(codegenlib_py): $(top_srcdir)/codegen/amqp_codegen.py $(codegenlib_path)
93-
$(AM_V_GEN)$(PYTHON2TO3) $(top_srcdir)/codegen/amqp_codegen.py | patch -p0 -o $(codegenlib_py)
94-
else
95-
codegen_py = $(top_srcdir)/librabbitmq/codegen.py
96-
codegenlib_py = $(top_srcdir)/codegen/amqp_codegen.py
97-
codegenlib_path = $(top_srcdir)/codegen
98-
endif
99-
100-
amqp_codegen_json = $(top_srcdir)/codegen/amqp-rabbitmq-0.9.1.json
101-
102-
amqp_framing_h = $(amqp_framing_dir)/amqp_framing.h
103-
amqp_framing_c = $(amqp_framing_dir)/amqp_framing.c
104-
105-
$(amqp_framing_dir):
106-
$(AM_V_at)$(MKDIR_P) $@
107-
108-
$(amqp_framing_h): $(amqp_codegen_json) $(codegen_py) $(codegenlib_py) $(amqp_framing_dir)
109-
$(AM_V_GEN)PYTHONPATH=$(codegenlib_path) $(PYTHON) $(codegen_py) header $< $@
110-
111-
$(amqp_framing_c): $(amqp_codegen_json) $(codegen_py) $(codegenlib_py) $(amqp_framing_dir)
112-
$(AM_V_GEN)PYTHONPATH=$(codegenlib_path) $(PYTHON) $(codegen_py) body $< $@
113-
114-
BUILT_SOURCES = \
115-
$(amqp_framing_h) \
116-
$(amqp_framing_c)
117-
118-
include_HEADERS += $(amqp_framing_h)
119-
120-
else
121-
include_HEADERS += $(top_srcdir)/librabbitmq/amqp_framing.h
122-
endif #REGENERATE_AMQP_FRAMING
12371

12472
check_PROGRAMS = \
12573
tests/test_tables \
@@ -287,18 +235,21 @@ tools_libcommon_la_CFLAGS = \
287235
tools_platform_CFLAGS = $(AM_CFLAGS)
288236

289237
if OS_UNIX
290-
tools_libcommon_la_SOURCES += tools/unix/process.c
291-
tools_libcommon_la_SOURCES += tools/unix/process.h
238+
tools_libcommon_la_SOURCES += \
239+
tools/unix/process.c \
240+
tools/unix/process.h
292241
tools_platform_CFLAGS += -I$(top_srcdir)/tools/unix
293242
endif
294243

295244
if OS_WIN32
296-
tools_libcommon_la_SOURCES += tools/win32/compat.c
297-
tools_libcommon_la_SOURCES += tools/win32/compat.h
298-
tools_libcommon_la_SOURCES += tools/win32/process.c
299-
tools_libcommon_la_SOURCES += tools/win32/process.h
300-
tools_platform_CFLAGS += -I$(top_srcdir)/tools/win32
301-
tools_platform_CFLAGS += -I$(top_srcdir)/tools/win32/msinttypes
245+
tools_libcommon_la_SOURCES += \
246+
tools/win32/compat.c \
247+
tools/win32/compat.h \
248+
tools/win32/process.c \
249+
tools/win32/process.h
250+
tools_platform_CFLAGS += \
251+
-I$(top_srcdir)/tools/win32 \
252+
-I$(top_srcdir)/tools/win32/msinttypes
302253
endif
303254

304255
bin_PROGRAMS = \
@@ -392,37 +343,40 @@ endif # DOCS
392343
endif # TOOLS
393344

394345
EXTRA_DIST = \
395-
$(man_MANS) \
346+
AUTHORS \
347+
CMakeLists.txt \
348+
CONTRIBUTING.md \
349+
ChangeLog.md \
396350
LICENSE-MIT \
397-
codegen/LICENSE \
398-
codegen/LICENSE-MPL-RabbitMQ \
399-
codegen/Makefile \
400-
codegen/README.extensions.md \
401-
codegen/amqp-rabbitmq-0.8.json \
402-
codegen/amqp-rabbitmq-0.9.1.json \
403-
codegen/amqp_codegen.py \
404-
codegen/demo_extension.json \
405-
codegen/license_info \
406-
debian \
351+
README-win32.md \
352+
README.md \
353+
README.vms \
354+
THANKS \
355+
TODO \
356+
cmake \
357+
codegen \
358+
descrip.mms \
359+
docs \
360+
examples/CMakeLists.txt \
361+
examples/descrip.mms \
362+
librabbitmq/CMakeLists.txt \
407363
librabbitmq/codegen.py \
364+
librabbitmq/descrip.mms \
365+
tests/CMakeLists.txt \
408366
tests/test_tables.expected \
367+
tools/CMakeLists.txt \
409368
tools/doc/amqp-consume.xml \
410369
tools/doc/amqp-declare-queue.xml \
411370
tools/doc/amqp-delete-queue.xml \
412371
tools/doc/amqp-get.xml \
413372
tools/doc/amqp-publish.xml \
414-
tools/doc/librabbitmq-tools.xml
373+
tools/doc/librabbitmq-tools.xml \
374+
vms
415375

416376
MOSTLYCLEANFILES = \
417377
$(man_MANS) \
418378
$(top_builddir)/tools/doc/man-date.ent
419379

420-
if REGENERATE_AMQP_FRAMING
421-
MOSTLYCLEANFILES += \
422-
$(amqp_framing_h) \
423-
$(amqp_framing_c)
424-
endif #REGENERATE_AMQP_FRAMING
425-
426380
pkgconfigdir = $(libdir)/pkgconfig
427381
pkgconfig_DATA = librabbitmq.pc
428382

‎configure.ac‎

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ m4_define([soversion_revision], [1])
1717
m4_define([soversion_age], [0])
1818

1919
AC_INIT([rabbitmq-c], [major_version.minor_version.micro_version],
20-
[https://github.com/alanxz/rabbitmq-c/issues], [librabbitmq],
20+
[https://github.com/alanxz/rabbitmq-c/issues], [rabbitmq-c],
2121
[http://www.rabbitmq.com/])
2222
AC_CONFIG_MACRO_DIR([m4])
2323
AM_INIT_AUTOMAKE([1.9 subdir-objects foreign -Wno-portability])
@@ -101,35 +101,6 @@ AC_SEARCH_LIBS([socket], [socket], [],
101101
AC_SEARCH_LIBS([clock_gettime], [rt])
102102
AC_CHECK_FUNCS([htonll])
103103

104-
AC_ARG_ENABLE([regen-amqp-framing],
105-
[AS_HELP_STRING([--enable-regen-amqp-framing],
106-
[Regenerate amqp_framing.h/amqp_framing.c (for developer use)])])
107-
108-
AM_CONDITIONAL([REGENERATE_AMQP_FRAMING], [test "x$enable_regen_amqp_framing" = "xyes"])
109-
110-
AS_IF([test "x$enable_regen_amqp_framing" = "xyes"],
111-
[AM_PATH_PYTHON([2.4],,AC_MSG_ERROR([--enable-regen-amqp-framing requires python]))
112-
113-
AX_PYTHON_MODULE([json], [])
114-
AS_IF([test "x$HAVE_PYMOD_JSON" = "xno"],
115-
[AX_PYTHON_MODULE([simplejson])])
116-
AS_IF([test "x$HAVE_PYMOD_JSON" = "xno" && test "x$HAVE_PYMOD_SIMPLEJSON" = "xno"],
117-
[AC_MSG_ERROR([Unable to find json or simplejson python modules])])
118-
119-
AS_VERSION_COMPARE([$PYTHON_VERSION],[3.0],
120-
[eval HAVE_PYTHON3=no],
121-
[eval HAVE_PYTHON3=yes],
122-
[eval HAVE_PYTHON3=yes])
123-
124-
AS_IF([test "x$HAVE_PYTHON3" = "xyes"],
125-
[AC_PATH_PROG(PYTHON2TO3,[2to3])
126-
AS_IF([test "x$PYTHON2TO3" = "x"],
127-
AC_MSG_ERROR([Unable to find 2to3 python utility]))])
128-
129-
],
130-
[HAVE_PYTHON3=no])
131-
AM_CONDITIONAL([PYTHON3], [test "x$HAVE_PYTHON3" = "xyes"])
132-
133104
# Configure SSL/TLS
134105
AC_ARG_WITH([ssl],
135106
[AS_HELP_STRING([--with-ssl=@<:@cyassl/gnutls/no/openssl/polarssl/yes@:>@],

0 commit comments

Comments
 (0)