perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makefile modification

This commit is contained in:
Markus Gans 2018-09-21 07:06:18 +02:00
parent 68720529ca
commit 4df1aafcd0
25 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -50,6 +50,6 @@ examples/keyboard
examples/mouse
examples/timer
examples/ui
src/test/.deps/
src/test/.libs/
src/test/*_test
test/.deps/
test/.libs/
test/*_test

2
Makefile.am
View File

@ -13,7 +13,7 @@ pkgconfig_DATA = finalcut.pc
CLEANFILES = finalcut.pc
SUBDIRS = src fonts doc examples
SUBDIRS = src fonts doc examples test
docdir = ${datadir}/doc/${PACKAGE}
doc_DATA = AUTHORS COPYING COPYING.LESSER ChangeLog

2
Makefile.in
View File

@ -363,7 +363,7 @@ EXTRA_DIST = finalcut.pc
pkgconfigdir = $(datadir)/pkgconfig
pkgconfig_DATA = finalcut.pc
CLEANFILES = finalcut.pc
SUBDIRS = src fonts doc examples
SUBDIRS = src fonts doc examples test
doc_DATA = AUTHORS COPYING COPYING.LESSER ChangeLog
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive

2
build.sh
View File

@ -121,7 +121,7 @@ if [ "$1" = "--unit-test" ] \
|| [ "$1" = "--coverage" ] \
|| [ "$1" = "coverage" ]
then
cd src/test && make check-TESTS
cd test && make check-TESTS
cat *.log 2>/dev/null
fi

10
configure vendored
View File

@ -2365,7 +2365,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_config_headers="$ac_config_headers config.h"
ac_config_commands="$ac_config_commands include/final/fconfig.h"
ac_config_commands="$ac_config_commands src/include/final/fconfig.h"
ac_aux_dir=
@ -17786,7 +17786,7 @@ SO_VERSION="4:0:4"
ac_config_files="$ac_config_files Makefile src/Makefile fonts/Makefile doc/Makefile examples/Makefile src/test/Makefile finalcut.spec finalcut.pc"
ac_config_files="$ac_config_files Makefile src/Makefile fonts/Makefile doc/Makefile examples/Makefile test/Makefile finalcut.spec finalcut.pc"
# use GPM (General Purpose Mouse)
@ -19230,7 +19230,7 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"include/final/fconfig.h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/final/fconfig.h" ;;
"src/include/final/fconfig.h") CONFIG_COMMANDS="$CONFIG_COMMANDS src/include/final/fconfig.h" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
@ -19238,7 +19238,7 @@ do
"fonts/Makefile") CONFIG_FILES="$CONFIG_FILES fonts/Makefile" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
"src/test/Makefile") CONFIG_FILES="$CONFIG_FILES src/test/Makefile" ;;
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
"finalcut.spec") CONFIG_FILES="$CONFIG_FILES finalcut.spec" ;;
"finalcut.pc") CONFIG_FILES="$CONFIG_FILES finalcut.pc" ;;
@ -19836,7 +19836,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
case $ac_file$ac_mode in
"include/final/fconfig.h":C) ac_prefix_conf_OUT=`echo include/final/fconfig.h`
"src/include/final/fconfig.h":C) ac_prefix_conf_OUT=`echo src/include/final/fconfig.h`
ac_prefix_conf_DEF=`echo $ac_prefix_conf_OUT | sed -e "y:abcdefghijklmnopqrstuvwxyz:ABCDEFGHIJKLMNOPQRSTUVWXYZ:" -e "s/[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g"`
ac_prefix_conf_PKG=`echo F`
ac_prefix_conf_LOW=`echo _$ac_prefix_conf_PKG | sed -e "y:ABCDEFGHIJKLMNOPQRSTUVWXYZ-:abcdefghijklmnopqrstuvwxyz_:"`

4
configure.ac
View File

@ -6,7 +6,7 @@
AC_INIT([finalcut], [0.4.0])
AC_CONFIG_HEADER([config.h])
AX_PREFIX_CONFIG_H([include/final/fconfig.h], [F])
AX_PREFIX_CONFIG_H([src/include/final/fconfig.h], [F])
AC_CONFIG_SRCDIR([src/fobject.cpp])
AC_GNU_SOURCE
AM_INIT_AUTOMAKE
@ -71,7 +71,7 @@ AC_CONFIG_FILES([Makefile
fonts/Makefile
doc/Makefile
examples/Makefile
src/test/Makefile
test/Makefile
finalcut.spec
finalcut.pc])

4
src/Makefile.am
View File

@ -4,7 +4,7 @@
AM_CPPFLAGS = -Iinclude -Wall -Werror -DCOMPILE_FINAL_CUT
SUBDIRS = . test
SUBDIRS = .
lib_LTLIBRARIES = libfinal.la
@ -129,7 +129,5 @@ finalcutinclude_HEADERS = \
clean-local:
-find . \( -name "*.gcda" -o -name "*.gcno" -o -name "*.gcov" \) -delete
test: check
#uninstall:
# rm -R -f $(includedir)/final

4
src/Makefile.in
View File

@ -381,7 +381,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = -Iinclude -Wall -Werror -DCOMPILE_FINAL_CUT
SUBDIRS = . test
SUBDIRS = .
lib_LTLIBRARIES = libfinal.la
libfinal_la_SOURCES = \
fstring.cpp \
@ -965,8 +965,6 @@ uninstall-am: uninstall-finalcutincludeHEADERS \
clean-local:
-find . \( -name "*.gcda" -o -name "*.gcno" -o -name "*.gcov" \) -delete
test: check
#uninstall:
# rm -R -f $(includedir)/final

8
src/include/final/fconfig.h
View File

@ -1,7 +1,7 @@
#ifndef INCLUDE_FINAL_FCONFIG_H
#define INCLUDE_FINAL_FCONFIG_H 1
#ifndef SRC_INCLUDE_FINAL_FCONFIG_H
#define SRC_INCLUDE_FINAL_FCONFIG_H 1
/* include/final/fconfig.h. Generated automatically at end of configure. */
/* src/include/final/fconfig.h. Generated automatically at end of configure. */
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
@ -244,5 +244,5 @@
/* Define to 1 if you need to in order for `stat' and other things to work. */
/* #undef _POSIX_SOURCE */
/* once: INCLUDE_FINAL_FCONFIG_H */
/* once: SRC_INCLUDE_FINAL_FCONFIG_H */
#endif

2
src/test/Makefile.am → test/Makefile.am
View File

@ -4,7 +4,7 @@
if CPPUNIT_TEST
AM_LDFLAGS = -L$(top_builddir)/src/.libs -lfinal $(CPPUNIT_LIBS)
AM_CPPFLAGS = -I$(top_srcdir)/include -Wall -Werror
AM_CPPFLAGS = -I$(top_srcdir)/src/include -Wall -Werror
noinst_PROGRAMS = \
fobject_test \

4
src/test/Makefile.clang → test/Makefile.clang
View File

@ -11,8 +11,8 @@ SRCS = $(wildcard *.cpp)
OBJS = $(SRCS:%.cpp=%)
CCXFLAGS = $(OPTIMIZE) $(PROFILE) $(DEBUG)
MAKEFILE = -f Makefile.clang
LDFLAGS = -L.. -lfinal -lcppunit -ldl
INCLUDES = -I. -I../../include -I/usr/include/final
LDFLAGS = -L../src -lfinal -lcppunit -ldl
INCLUDES = -I. -I../src/include -I/usr/include/final
RM = rm -f
ifdef DEBUG

4
src/test/Makefile.gcc → test/Makefile.gcc
View File

@ -11,8 +11,8 @@ SRCS = $(wildcard *.cpp)
OBJS = $(SRCS:%.cpp=%)
CCXFLAGS = $(OPTIMIZE) $(PROFILE) $(DEBUG)
MAKEFILE = -f Makefile.gcc
LDFLAGS = -L.. -lfinal -lcppunit -ldl
INCLUDES = -I. -I../../include -I/usr/include/final
LDFLAGS = -L../src -lfinal -lcppunit -ldl
INCLUDES = -I. -I../src/include -I/usr/include/final
RM = rm -f
ifdef DEBUG

8
src/test/Makefile.in → test/Makefile.in
View File

@ -100,7 +100,7 @@ host_triplet = @host@
@CPPUNIT_TEST_TRUE@ fstring_test$(EXEEXT) fpoint_test$(EXEEXT) \
@CPPUNIT_TEST_TRUE@ frect_test$(EXEEXT)
@CPPUNIT_TEST_TRUE@check_PROGRAMS = $(am__EXEEXT_1)
subdir = src/test
subdir = test
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp $(top_srcdir)/test-driver
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -578,7 +578,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@CPPUNIT_TEST_TRUE@AM_LDFLAGS = -L$(top_builddir)/src/.libs -lfinal $(CPPUNIT_LIBS)
@CPPUNIT_TEST_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/include -Wall -Werror
@CPPUNIT_TEST_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/src/include -Wall -Werror
@CPPUNIT_TEST_TRUE@fobject_test_SOURCES = fobject-test.cpp
@CPPUNIT_TEST_TRUE@fmouse_test_SOURCES = fmouse-test.cpp
@CPPUNIT_TEST_TRUE@fkeyboard_test_SOURCES = fkeyboard-test.cpp
@ -602,9 +602,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/test/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu src/test/Makefile
$(AUTOMAKE) --gnu test/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \

0
src/test/fkeyboard-test.cpp → test/fkeyboard-test.cpp
View File

0
src/test/fmouse-test.cpp → test/fmouse-test.cpp
View File

0
src/test/fobject-test.cpp → test/fobject-test.cpp
View File

0
src/test/foptiattr-test.cpp → test/foptiattr-test.cpp
View File

0
src/test/foptimove-test.cpp → test/foptimove-test.cpp
View File

0
src/test/fpoint-test.cpp → test/fpoint-test.cpp
View File

0
src/test/frect-test.cpp → test/frect-test.cpp
View File

0
src/test/fstring-test.cpp → test/fstring-test.cpp
View File

0
src/test/ftermcapquirks-test.cpp → test/ftermcapquirks-test.cpp
View File

0
src/test/ftermdetection-test.cpp → test/ftermdetection-test.cpp
View File

0
src/test/main-test.inc → test/main-test.inc
View File

0
src/test/test.sh → test/test.sh
View File