diff options
| author | rbuj <[email protected]> | 2020-01-27 12:53:27 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2020-02-29 21:23:50 +0100 |
| commit | 0d372c1a0ae345d8ebbc69c52e9d55165e766109 (patch) | |
| tree | a19c197a9c087253afa045dfb603c72d6a27ffc3 /image-converter | |
| parent | a53a6e6bc6ac5092e82ae493520b1538c6ccc304 (diff) | |
| download | caja-extensions-0d372c1a0ae345d8ebbc69c52e9d55165e766109.tar.bz2 caja-extensions-0d372c1a0ae345d8ebbc69c52e9d55165e766109.tar.xz | |
automake: do not include CFLAGS in CPPFLAGS
Diffstat (limited to 'image-converter')
| -rw-r--r-- | image-converter/Makefile.am | 43 |
1 files changed, 30 insertions, 13 deletions
diff --git a/image-converter/Makefile.am b/image-converter/Makefile.am index 1e56060..0b8154f 100644 --- a/image-converter/Makefile.am +++ b/image-converter/Makefile.am @@ -1,26 +1,43 @@ +NULL = AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"Caja-Image-Converter\" \ + $(DISABLE_DEPRECATED_CPPFLAGS) \ -DDATADIR=\"$(datadir)\" \ - -DMATELOCALEDIR=\""$(datadir)/locale"\" \ + -DMATELOCALEDIR=\""$(datadir)/locale"\" \ -I$(top_srcdir) \ -I$(top_builddir) \ - $(WARN_CFLAGS) \ - $(DISABLE_DEPRECATED_CFLAGS) \ - $(CAJA_CFLAGS) \ - $(IMAGE_CONVERTER_CFLAGS) + $(NULL) + +AM_CFLAGS = \ + $(WARN_CFLAGS) \ + $(NULL) caja_extensiondir=$(CAJA_EXTENSION_DIR) caja_extension_LTLIBRARIES=libcaja-image-converter.la -libcaja_image_converter_la_SOURCES = \ - image-converter.c \ - caja-image-converter.c caja-image-converter.h \ - caja-image-resizer.c caja-image-resizer.h \ - caja-image-rotator.c caja-image-rotator.h - +libcaja_image_converter_la_SOURCES = \ + image-converter.c \ + caja-image-converter.c \ + caja-image-converter.h \ + caja-image-resizer.c \ + caja-image-resizer.h \ + caja-image-rotator.c \ + caja-image-rotator.h \ + $(NULL) +libcaja_image_converter_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DG_LOG_DOMAIN=\"Caja-Image-Converter\" \ + $(NULL) +libcaja_image_converter_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CAJA_CFLAGS) \ + $(IMAGE_CONVERTER_CFLAGS) \ + $(NULL) libcaja_image_converter_la_LDFLAGS = -module -avoid-version -libcaja_image_converter_la_LIBADD = $(CAJA_LIBS) $(IMAGE_CONVERTER_LIBS) +libcaja_image_converter_la_LIBADD = \ + $(CAJA_LIBS) \ + $(IMAGE_CONVERTER_LIBS) \ + $(NULL) builderdir = $(datadir)/caja-extensions builder_DATA = \ |