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