Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge libgphoto2_port buildsystem into the libgphoto2 buildsystem #731

Draft
wants to merge 37 commits into
base: master
Choose a base branch
from
Draft

Merge libgphoto2_port buildsystem into the libgphoto2 buildsystem #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
379c170
Make the compiler warnings work with clang as well
ndim Oct 25, 2021
9fcbbd6
tests: Remove old pedantic compilation tests
ndim Oct 26, 2021
d87169a
tests: Always define programs, conditionally test them
ndim Oct 26, 2021
0fc843a
tests: add pedantic compile test for -std=c++20
ndim Oct 26, 2021
698ab00
Use m4_pattern_forbid to find unnoticed GP_ strings
ndim Oct 18, 2021
2d833ea
Update libltdl checks (GP_LIBLTDL)
ndim Oct 18, 2021
ba5455a
Update the checks for jpeg-turbo libjpeg
ndim Oct 25, 2021
1e34445
AC_INIT change to arguments on multiple lines
ndim Oct 12, 2021
24f4746
AM_INIT_AUTOMAKE change to indented multi-line form
ndim Oct 12, 2021
b60acf5
AC_CONFIG_FILES change to indented multi-line form
ndim Oct 12, 2021
5d5b5c6
m4 quote all macro arguments
ndim Oct 12, 2021
c6ffccf
Use the same gettext setup
ndim Oct 22, 2021
1cf0d9f
Use LINGUAS files instead of ALL_LINGUAS variable
ndim Oct 22, 2021
f6f82a3
remove old libtool/libltdl comments
ndim Oct 12, 2021
41fd7f3
make gphoto-m4 directories identical
ndim Oct 22, 2021
7307300
Only use a single gphoto-m4/ subdir
ndim Oct 22, 2021
a956921
Add "mode: autoconf" line to all *.m4 files
ndim Oct 31, 2021
ecfe6b3
indentation for readability
ndim Oct 12, 2021
123051d
Remove definition of localedir
ndim Oct 31, 2021
f848fc0
gp-camlibs.m4: Fix GP_SLEEP invocation in in Gentoo hack
ndim Oct 30, 2021
14d17da
with-camlibs: grammar fix for standard set description
ndim Oct 30, 2021
a1fcb3d
with-camlibs: document "everything" set in the --help output
ndim Oct 30, 2021
24f6caa
Add build tool version comment
ndim Oct 12, 2021
5a245ad
Require at least autoconf-2.69
ndim Oct 31, 2021
be5ec8a
Require at least automake 1.14
ndim Oct 31, 2021
5142f1a
Replace obsolete AC_TRY_LINK with AC_LINK_IFELSE
ndim Oct 12, 2021
e28f3e8
Replace obsolete AC_TRY_LINK_FUNC with AC_LINK_IFELSE(...)
ndim Oct 12, 2021
dfbdbf7
Replace obsolete AC_TRY_COMPILE with AC_COMPILE_IFELSE
ndim Oct 12, 2021
50dcc9f
Use same AC_LANG invocation in both configure.ac files
ndim Oct 12, 2021
22603b6
Use AS_VAR_IF and AS_IF as often as possible
ndim Oct 12, 2021
2b6de49
GP_CONFIG_MSG args with spaces or on multiple lines
ndim Oct 12, 2021
3c3c6fa
GP_CHECK_LIBRARY arguments with spacing
ndim Oct 12, 2021
834ef05
AC_CHECK_HEADERS: use indented multi line argument
ndim Oct 12, 2021
fcde662
AC_CHECK_FUNCS: use indented multi line argument
ndim Oct 12, 2021
1039a4b
AC_CHECK_(FUNCS|HEADERS): sort arguments removing duplicates
ndim Oct 12, 2021
61eda82
Invoke AC_PROG_SED before using ${SED}
ndim Oct 31, 2021
4a8e1ea
Require at least libtool 2.4.2, use LT_INIT
ndim Oct 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ bin_SCRIPTS = gphoto2-config
EXTRA_DIST = MAINTAINERS TESTERS installcheck.mk
EXTRA_DIST += HACKING.md SECURITY.md

# Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS()
SUBDIRS = @subdirs@ libgphoto2 camlibs tests examples po packaging doc gphoto-m4
# Note: $(subdirs) lists all the directories from AC_CONFIG_SUBDIRS()
SUBDIRS = $(subdirs) libgphoto2 camlibs tests examples po packaging doc

EXTRA_DIST += libgphoto2.pc.in
pkgconfig_DATA = libgphoto2.pc
Expand Down Expand Up @@ -106,7 +106,9 @@ update-po:

########################################################################
# The following default options for aclocal and automake
# are required in the top level Makefile.am for the automatic
# are required in the top level Makefile.am for the automatic
# re-building of the build system files.

ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4
ACLOCAL_AMFLAGS = -I auto-m4 -I libgphoto2_port/gphoto-m4

include libgphoto2_port/gphoto-m4/Makefile-files
4 changes: 2 additions & 2 deletions camlibs/ax203/Makefile-files
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ EXTRA_LTLIBRARIES += ax203.la
ax203_la_SOURCES = ax203/library.c ax203/ax203.c ax203/ax203.h ax203/ax203_decode_yuv.c ax203/ax203_decode_yuv_delta.c ax203/ax203_compress_jpeg.c ax203/jpeg_memsrcdest.h ax203/jpeg_memsrcdest.c ax203/tinyjpeg.c ax203/tinyjpeg.h ax203/tinyjpeg-internal.h ax203/jidctflt.c
ax203_la_LDFLAGS = $(camlib_ldflags)
ax203_la_DEPENDENCIES = $(camlib_dependencies)
ax203_la_LIBADD = $(camlib_libadd) @LIBGD_LIBS@ @LIBJPEG@
ax203_la_CFLAGS = @LIBGD_CFLAGS@
ax203_la_LIBADD = $(camlib_libadd) @LIBGD_LIBS@ $(LIBJPEG_LIBS)
ax203_la_CFLAGS = @LIBGD_CFLAGS@ $(LIBJPEG_CFLAGS)
3 changes: 2 additions & 1 deletion camlibs/jl2005c/Makefile-files
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ jl2005c_la_SOURCES = jl2005c/library.c\
jl2005c/img_enhance.h
jl2005c_la_LDFLAGS = $(camlib_ldflags)
jl2005c_la_DEPENDENCIES = $(camlib_dependencies)
jl2005c_la_LIBADD = $(camlib_libadd) @LIBJPEG@
jl2005c_la_LIBADD = $(camlib_libadd) $(LIBJPEG_LIBS)
jl2005c_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBJPEG_CFLAGS)
4 changes: 2 additions & 2 deletions camlibs/ptp2/Makefile-files
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ camlibdoc_DATA += ptp2/README.ptp2

EXTRA_LTLIBRARIES += ptp2.la

ptp2_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBXML2_CFLAGS)
ptp2_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBXML2_CFLAGS) $(LIBJPEG_CFLAGS)
ptp2_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS) $(LIBXML2_CFLAGS) -Wshadow
ptp2_la_SOURCES = \
ptp2/ptp.c ptp2/ptp.h ptp2/chdk_ptp.h ptp2/chdk_live_view.h \
Expand All @@ -17,4 +17,4 @@ ptp2_la_SOURCES = \
ptp2/chdk.c ptp2/fujiptpip.c ptp2/ptpip-private.h
ptp2_la_LDFLAGS = $(camlib_ldflags)
ptp2_la_DEPENDENCIES = $(camlib_dependencies)
ptp2_la_LIBADD = $(camlib_libadd) $(LTLIBICONV) $(LIBXML2_LIBS) @LIBJPEG@ @LIBWS232@
ptp2_la_LIBADD = $(camlib_libadd) $(LTLIBICONV) $(LIBXML2_LIBS) $(LIBJPEG_LIBS) @LIBWS232@
3 changes: 2 additions & 1 deletion camlibs/sipix/Makefile-files
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ EXTRA_LTLIBRARIES += sipix_blink2.la
sipix_blink2_la_SOURCES = sipix/blink2.c
sipix_blink2_la_LDFLAGS = $(camlib_ldflags)
sipix_blink2_la_DEPENDENCIES = $(camlib_dependencies)
sipix_blink2_la_LIBADD = $(camlib_libadd) @LIBJPEG@
sipix_blink2_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBJPEG_CFLAGS)
sipix_blink2_la_LIBADD = $(camlib_libadd) $(LIBJPEG_LIBS)


EXTRA_LTLIBRARIES += sipix_web2.la
Expand Down
Loading