diff options
author | Thomas White <taw@physics.org> | 2019-05-16 15:17:53 +0200 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2019-05-16 15:17:53 +0200 |
commit | cf040a18b3f5da827f959346a45a907d5dd6eb49 (patch) | |
tree | 23a0aaca091121013ee12a21e79031344daaaef6 /plugin | |
parent | 04a77910fa4adb5845cbcf751dd7c3522c191474 (diff) | |
parent | 12196f21e352b952cda3e837cf2467b75dd1e6e6 (diff) |
Merge branch 'taw/meson' into taw/combined
Diffstat (limited to 'plugin')
-rw-r--r-- | plugin/.gitignore | 2 | ||||
-rw-r--r-- | plugin/Makefile.am | 1 | ||||
-rw-r--r-- | plugin/attachment_tool/Makefile.am | 20 | ||||
-rw-r--r-- | plugin/test/.gitignore | 3 | ||||
-rw-r--r-- | plugin/test/Makefile.am | 20 |
5 files changed, 5 insertions, 41 deletions
diff --git a/plugin/.gitignore b/plugin/.gitignore new file mode 100644 index 00000000..b336cc7c --- /dev/null +++ b/plugin/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/plugin/Makefile.am b/plugin/Makefile.am deleted file mode 100644 index 5f2ed523..00000000 --- a/plugin/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = attachment_tool test diff --git a/plugin/attachment_tool/Makefile.am b/plugin/attachment_tool/Makefile.am deleted file mode 100644 index 81079b68..00000000 --- a/plugin/attachment_tool/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -libdir = $(plugindir) - -lib_LTLIBRARIES = attachment_tool.la - -attachment_tool_la_SOURCES = attachment_tool.c -attachment_tool_la_LDFLAGS = -module -no-undefined -avoid-version - -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/libsylph \ - -I$(top_srcdir)/src \ - $(GTK_CFLAGS) - -attachment_tool_la_LIBADD = \ - $(GTK_LIBS) \ - $(top_builddir)/src/libsylpheed-plugin-0.la \ - $(top_builddir)/libsylph/libsylph-0.la - -install: -install-plugin: install-am diff --git a/plugin/test/.gitignore b/plugin/test/.gitignore new file mode 100644 index 00000000..f53478a0 --- /dev/null +++ b/plugin/test/.gitignore @@ -0,0 +1,3 @@ +/.deps +/Makefile +/Makefile.in diff --git a/plugin/test/Makefile.am b/plugin/test/Makefile.am deleted file mode 100644 index dabf7980..00000000 --- a/plugin/test/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -libdir = $(plugindir) - -lib_LTLIBRARIES = test.la - -test_la_SOURCES = test.c test.h -test_la_LDFLAGS = -module -no-undefined -avoid-version - -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/libsylph \ - -I$(top_srcdir)/src \ - $(GTK_CFLAGS) - -test_la_LIBADD = \ - $(GTK_LIBS) \ - $(top_builddir)/src/libsylpheed-plugin-0.la \ - $(top_builddir)/libsylph/libsylph-0.la - -install: -install-plugin: install-am |