diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-02-24 14:52:49 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-02-24 14:52:49 +0100 |
| commit | 924ceb305dc1dced54beaa6ffe4b72b9f2609c6a (patch) | |
| tree | 1dd9c29e5bda8d7b6f4952827ffe9218bc060df4 /tests | |
| parent | 46d7840b2500fd4cd3044ad06481f27ce97ee2ad (diff) | |
| parent | 24a36fd14226ccf5f139c07252f05f3db124604e (diff) | |
| download | rsyslog-924ceb305dc1dced54beaa6ffe4b72b9f2609c6a.tar.gz rsyslog-924ceb305dc1dced54beaa6ffe4b72b9f2609c6a.tar.xz rsyslog-924ceb305dc1dced54beaa6ffe4b72b9f2609c6a.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
Makefile.am
configure.ac
doc/manual.html
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 2cfd5bfb..14e7c195 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -19,11 +19,11 @@ EXTRA_DIST=1.rstest 2.rstest err1.rstest \ NoExistFile.cfgtest rt_init_SOURCES = rt-init.c $(test_files) -rt_init_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) $(rsrt_cflags) -rt_init_LDADD = $(rsrt_libs) $(zlib_libs) $(pthreads_libs) +rt_init_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) +rt_init_LDADD = $(RSRT_LIBS) $(ZLIB_LIBS) $(PTHREADS_LIBS) rt_init_LDFLAGS = -export-dynamic rscript_SOURCES = rscript.c $(test_files) -rscript_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) $(rsrt_cflags) -rscript_LDADD = $(rsrt_libs) $(zlib_libs) $(pthreads_libs) +rscript_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) +rscript_LDADD = $(RSRT_LIBS) $(ZLIB_LIBS) $(PTHREADS_LIBS) rscript_LDFLAGS = -export-dynamic |