Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,23 @@ m4/
test/.deps/
test/.libs/
test/*_test
Makefile.in
aclocal.m4
ar-lib
compile
config.guess
config.h.in
config.sub
configure
depcomp
doc/Makefile.in
examples/Makefile.in
final/Makefile.in
final/font/Makefile.in
finalcut.pc
install-sh
ltmain.sh
m4/
missing
test-driver
test/Makefile.in
53 changes: 52 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,58 @@ AUTOMAKE_OPTIONS = foreign

ACLOCAL_AMFLAGS = -I m4

EXTRA_DIST = finalcut.pc
EXTRA_DIST = finalcut.pc \
.codacy.yml \
.codedocs \
.editorconfig \
.github/ISSUE_TEMPLATE/bug_report.md \
.github/ISSUE_TEMPLATE/feature_request.md \
.github/scripts/get_code_cov.sh \
.github/workflows/alpine.yml \
.github/workflows/arm.yml \
.github/workflows/codeql-analysis.yml \
.github/workflows/coverage.yml \
.github/workflows/coverity-scan.yml \
.github/workflows/cygwin.yml \
.github/workflows/freebsd.yml \
.github/workflows/macos.yml \
.github/workflows/netbsd.yml \
.github/workflows/openbsd.yml \
.github/workflows/sigrid-publish.yml \
.github/workflows/sigrid-pullrequest.yml \
.github/workflows/solaris.yml \
.github/workflows/sonarcloud.yml \
.gitignore \
CODE_OF_CONDUCT.md \
Contributing.md \
LICENSE \
SECURITY.md \
autogen.sh \
build.sh \
codecov.yml \
sigrid.yaml \
sonar-project.properties \
misc/icon/16x16/finalcut.png \
misc/icon/24x24/finalcut.png \
misc/icon/256x256/finalcut.png \
misc/icon/32x32/finalcut.png \
misc/icon/48x48/finalcut.png \
misc/icon/scalable/finalcut.svg \
misc/logo/png/finalcut-logo.png \
misc/logo/svg/finalcut-logo.svg \
scripts/cppcheck.sh \
scripts/cpuprofile.sh \
scripts/disassemble.sh \
scripts/kcachegrind.sh \
scripts/library_calls.sh \
scripts/perf-call-graph.sh \
scripts/profile.sh \
scripts/remove_eol_spaces.sh \
scripts/show_graph_font.sh \
scripts/showconsolefont.sh \
scripts/syscall_statistic.sh \
scripts/valgrind.sh \
scripts/xterm-latin1.sh

if INSTALL_CMAKE_MODULES
cmakemodulesdir = @CMAKEMODULESDIR@
Expand Down
9 changes: 7 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ AC_CONFIG_HEADERS([config.h])
AX_PREFIX_CONFIG_H([final/fconfig.h], [F])
AC_CONFIG_SRCDIR([final/fobject.cpp])
AC_USE_SYSTEM_EXTENSIONS
AM_INIT_AUTOMAKE
AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-zip])
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
AC_PROG_CC

Expand Down Expand Up @@ -143,9 +143,14 @@ then
fi

# Check for the cmake executable
AC_ARG_ENABLE([install-cmake-modules],
AS_HELP_STRING([--disable-install-cmake-modules],
[disables installing CMake modules (default is yes)]),
[install_cmake_modules=${enableval}],
[install_cmake_modules=yes])
AC_PATH_PROG([CMAKE],
[cmake])
AM_CONDITIONAL([INSTALL_CMAKE_MODULES], [test -n "$CMAKE"])
AM_CONDITIONAL([INSTALL_CMAKE_MODULES], [test -n "$CMAKE" && test "x$install_cmake_modules" != "xno"])

if test -n "$CMAKE"
then
Expand Down
6 changes: 5 additions & 1 deletion doc/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,11 @@ EXTRA_DIST = \
widget-layout.md \
widget-lengths.svg \
xgraphics \
xterm.txt
xterm.txt \
FDialog.svg \
build_alpine_linux.txt \
subsystem-architecture.svg \
xpmview.png

doc_DATA = \
Mandelbrot.png \
Expand Down
8 changes: 8 additions & 0 deletions examples/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ if COMPILE_EXAMPLES
AM_LDFLAGS = -L$(top_builddir)/final/.libs
AM_CPPFLAGS = -I$(top_srcdir)/final -Wall -Werror -std=c++14

EXTRA_DIST = \
Makefile.clang \
Makefile.gcc \
pixmaps/colored-pencils.xpm \
pixmaps/cpu.xpm \
pixmaps/xconq.xpm \
xpmimage.h

noinst_PROGRAMS = \
7segment \
background-color \
Expand Down
10 changes: 9 additions & 1 deletion final/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ AUTOMAKE_OPTIONS = subdir-objects

SUBDIRS = . font

EXTRA_DIST = \
Makefile.clang \
Makefile.gcc \
eventloop/eventloop-class-diagram.txt \
font/40-finalcut-newfont.conf \
font/newfont.txt

DISTCLEANFILES=fconfig.h

lib_LTLIBRARIES = libfinal.la

libfinal_la_SOURCES = \
Expand Down Expand Up @@ -237,4 +246,3 @@ uninstall-hook:
if test -d ${finalcutvtermincludedir}; then rmdir ${finalcutvtermincludedir}; fi
if test -d ${finalcutwidgetincludedir}; then rmdir ${finalcutwidgetincludedir}; fi
if test -d ${finalcutincludedir}; then rmdir ${finalcutincludedir}; fi

8 changes: 8 additions & 0 deletions test/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@

LIBS = -lfinal $(CPPUNIT_LIBS)

EXTRA_DIST = Makefile.clang \
Makefile.gcc \
conemu.h \
fvterm_check.h \
main-test.inc \
test \
test.sh

if CPPUNIT_TEST

AM_LDFLAGS = -L$(top_builddir)/final/.libs
Expand Down
Loading