diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2022-05-29 00:12:16 +0200 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2022-09-01 22:36:00 +0200 |
| commit | fa07a92c476ed898fee7052f47884e2199532157 (patch) | |
| tree | 5c10698f05bb4cbd3434fd8c38800f5238873bf4 /camlibs/sierra | |
| parent | 22a8459c687d6bddbf74afcfaebddd72d09a1212 (diff) | |
| download | libgphoto2-fa07a92c476ed898fee7052f47884e2199532157.tar.gz | |
camlib build var cleanup
Consistently use the same notation and formatting for all
camlib Makefile-files, which uses
* common $(camlib_cflags)
* common $(camlib_cppflags)
* common $(camlib_dependencies)
* common $(camlib_ldflags)
* common $(camlib_libadd)
and then groups additional related definitions together,
making it obvious when e.g. bar_la_LIBADD adds FOO_LIBS
but bar_la_CPPFLAGS forgot to add FOO_CFLAGS.
Diffstat (limited to 'camlibs/sierra')
| -rw-r--r-- | camlibs/sierra/Makefile-files | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/camlibs/sierra/Makefile-files b/camlibs/sierra/Makefile-files index 9d791809d..b9e62d8e7 100644 --- a/camlibs/sierra/Makefile-files +++ b/camlibs/sierra/Makefile-files @@ -1,16 +1,30 @@ -# -*- Makefile -*- +# -*- Makefile-automake -*- -EXTRA_DIST += sierra/PROTOCOL sierra/ChangeLog sierra/MC-EU1-Protocol.txt +EXTRA_DIST += %reldir%/ChangeLog +EXTRA_DIST += %reldir%/MC-EU1-Protocol.txt +EXTRA_DIST += %reldir%/PROTOCOL -EXTRA_LTLIBRARIES += sierra.la -sierra_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBEXIF_CFLAGS) -sierra_la_SOURCES = \ - sierra/sierra.c sierra/sierra.h \ - sierra/library.c sierra/library.h \ - sierra/sierra-usbwrap.c sierra/sierra-usbwrap.h \ - sierra/sierra-desc.h sierra/sierra-desc.c \ - sierra/nikon-desc.c sierra/olympus-desc.c sierra/epson-desc.c -sierra_la_LDFLAGS = $(camlib_ldflags) -sierra_la_DEPENDENCIES = $(camlib_dependencies) -sierra_la_LIBADD = $(camlib_libadd) $(LIBEXIF_LIBS) +EXTRA_LTLIBRARIES += sierra.la + +sierra_la_SOURCES = +sierra_la_SOURCES += %reldir%/sierra.c +sierra_la_SOURCES += %reldir%/sierra.h +sierra_la_SOURCES += %reldir%/library.c +sierra_la_SOURCES += %reldir%/library.h +sierra_la_SOURCES += %reldir%/sierra-usbwrap.c +sierra_la_SOURCES += %reldir%/sierra-usbwrap.h +sierra_la_SOURCES += %reldir%/sierra-desc.h +sierra_la_SOURCES += %reldir%/sierra-desc.c +sierra_la_SOURCES += %reldir%/nikon-desc.c +sierra_la_SOURCES += %reldir%/olympus-desc.c +sierra_la_SOURCES += %reldir%/epson-desc.c + +sierra_la_CFLAGS = $(camlib_cflags) +sierra_la_CPPFLAGS = $(camlib_cppflags) +sierra_la_DEPENDENCIES = $(camlib_dependencies) +sierra_la_LDFLAGS = $(camlib_ldflags) +sierra_la_LIBADD = $(camlib_libadd) + +sierra_la_CPPFLAGS += $(LIBEXIF_CFLAGS) +sierra_la_LIBADD += $(LIBEXIF_LIBS) |