diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-14 14:49:01 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-14 14:49:01 +0200 |
commit | 85ccd6e9b78d9136d5df3e082d9e971e0b8a7ef1 (patch) | |
tree | d36a73e60aa9dc497dc218c64d74d53268139fe3 /plugins/omdtn/Makefile.am | |
parent | 01e5d51c57536acfa8e05d5b22c001a6cf0701d8 (diff) | |
parent | 01f2c7a7a3ee394028eb36d9709490cbc26c7369 (diff) | |
download | rsyslog-85ccd6e9b78d9136d5df3e082d9e971e0b8a7ef1.tar.gz rsyslog-85ccd6e9b78d9136d5df3e082d9e971e0b8a7ef1.tar.xz rsyslog-85ccd6e9b78d9136d5df3e082d9e971e0b8a7ef1.zip |
Merge branch 'omprog' into nextmaster
Conflicts:
ChangeLog
runtime/rsyslog.h
Diffstat (limited to 'plugins/omdtn/Makefile.am')
-rw-r--r-- | plugins/omdtn/Makefile.am | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/plugins/omdtn/Makefile.am b/plugins/omdtn/Makefile.am deleted file mode 100644 index afb57476..00000000 --- a/plugins/omdtn/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -pkglib_LTLIBRARIES = omdtn.la - -omdtn_la_SOURCES = omdtn.c -omdtn_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) -omdtn_la_LDFLAGS = -module -avoid-version -omdtn_la_LIBADD = - -EXTRA_DIST = |