Skip to content

Commit 3fde138

Browse files
committed
Update Makefile.am to make for Windows.
1 parent aa7b31e commit 3fde138

File tree

1 file changed

+82
-11
lines changed

1 file changed

+82
-11
lines changed

Makefile.am

Lines changed: 82 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
ACLOCAL_AMFLAGS = -I m4
22
AM_YFLAGS = -d
33

4+
if BUILD_WIN32
5+
pkgdatadir=$(datadir)
6+
pkglibdir=$(libdir)/plugins
7+
pkglocalstatedir=${localstatedir}
8+
else
9+
pkglocalstatedir="${localstatedir}/lib/${PACKAGE_NAME}"
10+
endif
11+
12+
13+
414

515
BUILT_SOURCES = \
616
src/libcollectdclient/collectd/lcc_features.h \
@@ -100,7 +110,13 @@ lib_LTLIBRARIES = \
100110
libcollectd.la \
101111
libcollectdclient.la
102112

113+
if BUILD_WIN32
114+
# TODO: Build all executables on Windows as well.
115+
sbin_PROGRAMS = \
116+
collectd
103117

118+
bin_PROGRAMS =
119+
else
104120
sbin_PROGRAMS = \
105121
collectd \
106122
collectdmon
@@ -110,9 +126,9 @@ bin_PROGRAMS = \
110126
collectd-nagios \
111127
collectd-tg \
112128
collectdctl
129+
endif # BUILD_WIN32
113130

114-
115-
noinst_LTLIBRARIES = \
131+
EXTRA_LTLIBRARIES = \
116132
libavltree.la \
117133
libcmds.la \
118134
libcommon.la \
@@ -126,7 +142,6 @@ noinst_LTLIBRARIES = \
126142
libmount.la \
127143
liboconfig.la
128144

129-
130145
check_LTLIBRARIES = \
131146
libplugin_mock.la
132147

@@ -160,20 +175,32 @@ PLUGIN_LDFLAGS = \
160175
-module \
161176
-avoid-version \
162177
-export-symbols-regex '\<module_register\>'
163-
178+
if BUILD_WIN32
179+
PLUGIN_LDFLAGS += -shared -no-undefined
180+
endif
164181

165182
AM_CPPFLAGS = \
166183
-I$(top_srcdir)/src -I$(top_srcdir)/src/daemon \
167184
-DPREFIX='"${prefix}"' \
168185
-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
169186
-DLOCALSTATEDIR='"${localstatedir}"' \
170-
-DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \
187+
-DPKGLOCALSTATEDIR='"${pkglocalstatedir}"' \
171188
-DPLUGINDIR='"${pkglibdir}"' \
172189
-DPKGDATADIR='"${pkgdatadir}"'
173190

191+
COMMON_LDFLAGS =
192+
if BUILD_WIN32
193+
COMMON_LDFLAGS += -shared -no-undefined
194+
endif
174195

175196
# Link to these libraries..
176197
COMMON_LIBS = $(PTHREAD_LIBS)
198+
if BUILD_WIN32
199+
COMMON_LIBS += -lws2_32
200+
endif
201+
if BUILD_WITH_GNULIB
202+
COMMON_LIBS += -lgnu
203+
endif
177204
if BUILD_WITH_CAPABILITY
178205
COMMON_LIBS += -lcap
179206
endif
@@ -193,7 +220,6 @@ if BUILD_WITH_LIBDEVINFO
193220
COMMON_LIBS += -ldevinfo
194221
endif
195222

196-
197223
libcollectd_la_SOURCES = \
198224
src/daemon/configfile.c \
199225
src/daemon/configfile.h \
@@ -230,6 +256,7 @@ libcollectd_la_LIBADD = \
230256
libheap.la \
231257
liboconfig.la \
232258
-lm \
259+
-ldl \
233260
$(COMMON_LIBS) \
234261
$(DLOPEN_LIBS)
235262

@@ -499,6 +526,10 @@ libcollectdclient_la_CPPFLAGS = \
499526
-I$(srcdir)/src/daemon
500527
libcollectdclient_la_LDFLAGS = -version-info 2:0:1
501528
libcollectdclient_la_LIBADD = -lm
529+
if BUILD_WIN32
530+
libcollectdclient_la_LDFLAGS += -shared -no-undefined
531+
libcollectdclient_la_LIBADD += -lgnu -lws2_32 -liphlpapi
532+
endif
502533
if BUILD_WITH_LIBGCRYPT
503534
libcollectdclient_la_CPPFLAGS += $(GCRYPT_CPPFLAGS)
504535
libcollectdclient_la_LDFLAGS += $(GCRYPT_LDFLAGS)
@@ -526,7 +557,9 @@ liboconfig_la_SOURCES = \
526557
src/liboconfig/parser.y
527558
liboconfig_la_CPPFLAGS = -I$(srcdir)/src/liboconfig $(AM_CPPFLAGS)
528559
liboconfig_la_LDFLAGS = -avoid-version $(LEXLIB)
529-
560+
if BUILD_WIN32
561+
liboconfig_la_LDFLAGS += -shared -no-undefined
562+
endif
530563

531564
if BUILD_PLUGIN_AGGREGATION
532565
pkglib_LTLIBRARIES += aggregation.la
@@ -567,6 +600,9 @@ apcups_la_LIBADD =
567600
if BUILD_WITH_LIBSOCKET
568601
apcups_la_LIBADD += -lsocket
569602
endif
603+
if BUILD_WITH_GNULIB
604+
apcups_la_LIBADD += -lgnu
605+
endif
570606
endif
571607

572608
if BUILD_PLUGIN_APPLE_SENSORS
@@ -911,6 +947,9 @@ hddtemp_la_LIBADD =
911947
if BUILD_WITH_LIBSOCKET
912948
hddtemp_la_LIBADD += -lsocket
913949
endif
950+
if BUILD_WITH_GNULIB
951+
hddtemp_la_LIBADD += -lgnu
952+
endif
914953
endif
915954

916955
if BUILD_PLUGIN_HUGEPAGES
@@ -1019,6 +1058,7 @@ endif # BUILD_PLUGIN_LOAD
10191058
if BUILD_PLUGIN_LOGFILE
10201059
pkglib_LTLIBRARIES += logfile.la
10211060
logfile_la_SOURCES = src/logfile.c
1061+
logfile_la_LIBADD = libcollectd.la
10221062
logfile_la_LDFLAGS = $(PLUGIN_LDFLAGS)
10231063
endif
10241064

@@ -1081,6 +1121,7 @@ if BUILD_PLUGIN_MATCH_REGEX
10811121
pkglib_LTLIBRARIES += match_regex.la
10821122
match_regex_la_SOURCES = src/match_regex.c
10831123
match_regex_la_LDFLAGS = $(PLUGIN_LDFLAGS)
1124+
match_regex_la_LIBADD = libcollectd.la
10841125
endif
10851126

10861127
if BUILD_PLUGIN_MATCH_TIMEDIFF
@@ -1103,6 +1144,9 @@ mbmon_la_LIBADD =
11031144
if BUILD_WITH_LIBSOCKET
11041145
mbmon_la_LIBADD += -lsocket
11051146
endif
1147+
if BUILD_WITH_GNULIB
1148+
mbmon_la_LIBADD += -lgnu
1149+
endif
11061150
endif
11071151

11081152
if BUILD_PLUGIN_MCELOG
@@ -1137,6 +1181,9 @@ memcached_la_LIBADD =
11371181
if BUILD_WITH_LIBSOCKET
11381182
memcached_la_LIBADD += -lsocket
11391183
endif
1184+
if BUILD_WITH_GNULIB
1185+
memcached_la_LIBADD += -lgnu
1186+
endif
11401187
endif
11411188

11421189
if BUILD_PLUGIN_MEMORY
@@ -1223,10 +1270,16 @@ network_la_SOURCES = \
12231270
src/utils_fbhash.h
12241271
network_la_CPPFLAGS = $(AM_CPPFLAGS)
12251272
network_la_LDFLAGS = $(PLUGIN_LDFLAGS)
1226-
network_la_LIBADD =
1273+
network_la_LIBADD = libcollectd.la
12271274
if BUILD_WITH_LIBSOCKET
12281275
network_la_LIBADD += -lsocket
12291276
endif
1277+
if BUILD_WITH_GNULIB
1278+
network_la_LIBADD += -lgnu
1279+
endif
1280+
if BUILD_WIN32
1281+
network_la_LIBADD += -liphlpapi
1282+
endif
12301283
if BUILD_WITH_LIBGCRYPT
12311284
network_la_CPPFLAGS += $(GCRYPT_CPPFLAGS)
12321285
network_la_LDFLAGS += $(GCRYPT_LDFLAGS)
@@ -1278,6 +1331,9 @@ ntpd_la_LIBADD =
12781331
if BUILD_WITH_LIBSOCKET
12791332
ntpd_la_LIBADD += -lsocket
12801333
endif
1334+
if BUILD_WITH_GNULIB
1335+
ntpd_la_LIBADD += -lgnu
1336+
endif
12811337
endif
12821338

12831339
if BUILD_PLUGIN_NUMA
@@ -1302,6 +1358,9 @@ olsrd_la_LIBADD =
13021358
if BUILD_WITH_LIBSOCKET
13031359
olsrd_la_LIBADD += -lsocket
13041360
endif
1361+
if BUILD_WITH_GNULIB
1362+
olsrd_la_LIBADD += -lgnu
1363+
endif
13051364
endif
13061365

13071366
if BUILD_PLUGIN_ONEWIRE
@@ -1431,7 +1490,7 @@ python_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBPYTHON_LDFLAGS)
14311490
endif
14321491

14331492
if HAVE_LIBMNL
1434-
noinst_LTLIBRARIES += libtaskstats.la
1493+
EXTRA_LTLIBRARIES += libtaskstats.la
14351494
libtaskstats_la_SOURCES = \
14361495
src/utils_taskstats.c \
14371496
src/utils_taskstats.h
@@ -1589,6 +1648,7 @@ if BUILD_PLUGIN_SYSLOG
15891648
pkglib_LTLIBRARIES += syslog.la
15901649
syslog_la_SOURCES = src/syslog.c
15911650
syslog_la_LDFLAGS = $(PLUGIN_LDFLAGS)
1651+
syslog_la_LIBADD = libcollectd.la
15921652
endif
15931653

15941654
if BUILD_PLUGIN_TABLE
@@ -1637,6 +1697,7 @@ if BUILD_PLUGIN_TARGET_REPLACE
16371697
pkglib_LTLIBRARIES += target_replace.la
16381698
target_replace_la_SOURCES = src/target_replace.c
16391699
target_replace_la_LDFLAGS = $(PLUGIN_LDFLAGS)
1700+
target_replace_la_LIBADD = libcollectd.la
16401701
endif
16411702

16421703
if BUILD_PLUGIN_TARGET_SCALE
@@ -1649,6 +1710,7 @@ if BUILD_PLUGIN_TARGET_SET
16491710
pkglib_LTLIBRARIES += target_set.la
16501711
target_set_la_SOURCES = src/target_set.c
16511712
target_set_la_LDFLAGS = $(PLUGIN_LDFLAGS)
1713+
target_set_la_LIBADD = libcollectd.la
16521714
endif
16531715

16541716
if BUILD_PLUGIN_TARGET_V5UPGRADE
@@ -1701,6 +1763,9 @@ tokyotyrant_la_LIBADD = $(BUILD_WITH_LIBTOKYOTYRANT_LIBS)
17011763
if BUILD_WITH_LIBSOCKET
17021764
tokyotyrant_la_LIBADD += -lsocket
17031765
endif
1766+
if BUILD_WITH_GNULIB
1767+
tokyotyrant_la_LIBADD += -lgnu
1768+
endif
17041769
endif
17051770

17061771
if BUILD_PLUGIN_TURBOSTAT
@@ -1813,7 +1878,10 @@ write_http_la_SOURCES = \
18131878
src/utils_format_kairosdb.h
18141879
write_http_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS)
18151880
write_http_la_LDFLAGS = $(PLUGIN_LDFLAGS)
1816-
write_http_la_LIBADD = libformat_json.la $(BUILD_WITH_LIBCURL_LIBS)
1881+
write_http_la_LIBADD = libformat_json.la $(BUILD_WITH_LIBCURL_LIBS) libcollectd.la
1882+
if BUILD_WITH_GNULIB
1883+
write_http_la_LIBADD += -lgnu
1884+
endif
18171885
endif
18181886

18191887
if BUILD_PLUGIN_WRITE_KAFKA
@@ -1832,7 +1900,10 @@ if BUILD_PLUGIN_WRITE_LOG
18321900
pkglib_LTLIBRARIES += write_log.la
18331901
write_log_la_SOURCES = src/write_log.c
18341902
write_log_la_LDFLAGS = $(PLUGIN_LDFLAGS)
1835-
write_log_la_LIBADD = libformat_graphite.la libformat_json.la
1903+
write_log_la_LIBADD = libformat_graphite.la libformat_json.la libcollectd.la
1904+
if BUILD_WITH_GNULIB
1905+
write_log_la_LIBADD += -lgnu
1906+
endif
18361907
endif
18371908

18381909
if BUILD_PLUGIN_WRITE_MONGODB

0 commit comments

Comments
 (0)