43 lines
2.4 KiB
Diff
43 lines
2.4 KiB
Diff
|
diff -ur a/runtime/Makefile.am b/runtime/Makefile.am
|
||
|
|
--- a/runtime/Makefile.am 2014-01-20 13:00:47.922000000 -0500
|
||
|
|
+++ b/runtime/Makefile.am 2014-01-20 12:57:44.048000000 -0500
|
||
|
|
@@ -102,8 +102,8 @@
|
||
|
|
librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/\" -I\$(top_srcdir) -I\$(top_srcdir)/grammar
|
||
|
|
endif
|
||
|
|
#librsyslog_la_LDFLAGS = -module -avoid-version
|
||
|
|
-librsyslog_la_CPPFLAGS += $(PTHREADS_CFLAGS) $(LIBEE_CFLAGS) $(LIBUUID_CFLAGS) $(JSON_C_CFLAGS) -I\$(top_srcdir)/tools
|
||
|
|
-librsyslog_la_LIBADD = $(DL_LIBS) $(RT_LIBS) $(LIBEE_LIBS) $(LIBUUID_LIBS) $(JSON_C_LIBS)
|
||
|
|
+librsyslog_la_CPPFLAGS += $(PTHREADS_CFLAGS) $(LIBUUID_CFLAGS) $(JSON_C_CFLAGS) -I\$(top_srcdir)/tools
|
||
|
|
+librsyslog_la_LIBADD = $(DL_LIBS) $(RT_LIBS) $(LIBUUID_LIBS) $(JSON_C_LIBS)
|
||
|
|
|
||
|
|
#
|
||
|
|
# regular expression support
|
||
|
|
diff -ur a/runtime/Makefile.in b/runtime/Makefile.in
|
||
|
|
--- a/runtime/Makefile.in 2014-01-20 13:00:47.924000000 -0500
|
||
|
|
+++ b/runtime/Makefile.in 2014-01-20 12:57:44.050000000 -0500
|
||
|
|
@@ -574,19 +574,17 @@
|
||
|
|
@WITH_MODDIRS_FALSE@librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS \
|
||
|
|
@WITH_MODDIRS_FALSE@ -D_PATH_MODDIR=\"$(pkglibdir)/\" \
|
||
|
|
@WITH_MODDIRS_FALSE@ -I\$(top_srcdir) -I\$(top_srcdir)/grammar \
|
||
|
|
-@WITH_MODDIRS_FALSE@ $(PTHREADS_CFLAGS) $(LIBEE_CFLAGS) \
|
||
|
|
-@WITH_MODDIRS_FALSE@ $(LIBUUID_CFLAGS) $(JSON_C_CFLAGS) \
|
||
|
|
-@WITH_MODDIRS_FALSE@ -I\$(top_srcdir)/tools
|
||
|
|
+@WITH_MODDIRS_FALSE@ $(PTHREADS_CFLAGS) $(LIBUUID_CFLAGS) \
|
||
|
|
+@WITH_MODDIRS_FALSE@ $(JSON_C_CFLAGS) -I\$(top_srcdir)/tools
|
||
|
|
# the files with ../ we need to work on - so that they either become part of the
|
||
|
|
# runtime or will no longer be needed. -- rgerhards, 2008-06-13
|
||
|
|
#
|
||
|
|
#librsyslog_la_LDFLAGS = -module -avoid-version
|
||
|
|
@WITH_MODDIRS_TRUE@librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS \
|
||
|
|
@WITH_MODDIRS_TRUE@ -D_PATH_MODDIR=\"$(pkglibdir)/:$(moddirs)\" \
|
||
|
|
-@WITH_MODDIRS_TRUE@ $(PTHREADS_CFLAGS) $(LIBEE_CFLAGS) \
|
||
|
|
-@WITH_MODDIRS_TRUE@ $(LIBUUID_CFLAGS) $(JSON_C_CFLAGS) \
|
||
|
|
-@WITH_MODDIRS_TRUE@ -I\$(top_srcdir)/tools
|
||
|
|
-librsyslog_la_LIBADD = $(DL_LIBS) $(RT_LIBS) $(LIBEE_LIBS) $(LIBUUID_LIBS) $(JSON_C_LIBS)
|
||
|
|
+@WITH_MODDIRS_TRUE@ $(PTHREADS_CFLAGS) $(LIBUUID_CFLAGS) \
|
||
|
|
+@WITH_MODDIRS_TRUE@ $(JSON_C_CFLAGS) -I\$(top_srcdir)/tools
|
||
|
|
+librsyslog_la_LIBADD = $(DL_LIBS) $(RT_LIBS) $(LIBUUID_LIBS) $(JSON_C_LIBS)
|
||
|
|
@ENABLE_REGEXP_TRUE@lmregexp_la_SOURCES = regexp.c regexp.h
|
||
|
|
@ENABLE_REGEXP_TRUE@lmregexp_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
|
||
|
|
@ENABLE_REGEXP_TRUE@lmregexp_la_LDFLAGS = -module -avoid-version
|