Thomas Haller
75f29b8a9c
build: fix out-of-tree build for libnm/tests/libnm-vpnplugin-utils-test.la
2016-10-22 16:07:46 +02:00
Thomas Haller
67cc67ce46
build: merge branch 'th/non-recursive-make-bgo772985'
...
https://bugzilla.gnome.org/show_bug.cgi?id=772985
2016-10-21 19:17:27 +02:00
Thomas Haller
6c90b529a1
build: fix make always re-making vapigen target
...
Reproduce:
make
touch libnm-util/NetworkManager-1.0.gir
make
make
# rebuilds "VAPIGEN vapi/libnm-util.vapi" every time.
ls -la libnm-util/NetworkManager-1.0.gir vapi/libnm-util.vapi
# note that vapi/libnm-util.vapi was not touched.
See-also: https://git.gnome.org/browse/vala/tree/ccode/valaccodewriter.vala?id=f52b484954d3297ae4c3230fbe969db18eb08841#n117
See-also: https://bugzilla.gnome.org/show_bug.cgi?id=773325
2016-10-21 18:46:03 +02:00
Thomas Haller
351851cf27
build: merge "examples/Makefile.am" into toplevel Makefile
2016-10-21 17:37:57 +02:00
Thomas Haller
b648772fc4
build: merge "examples/C/qt/Makefile.am" into toplevel Makefile
2016-10-21 17:37:57 +02:00
Thomas Haller
742d36c476
build: merge "examples/C/glib/Makefile.am" into toplevel Makefile
2016-10-21 17:37:57 +02:00
Thomas Haller
14b5309af3
build: merge "vapi/Makefile.am" into toplevel Makefile
...
There is an strange automake warning
Makefile.vapigen:49: warning: $(1) was already defined in condition TRUE, which includes condition ENABLE_VAPIGEN ...
Makefile.am:4: 'Makefile.vapigen' included from here
Makefile.glib:124: ... '$(1)' previously defined here
Makefile.am:1: 'Makefile.glib' included from here
when having
if ENABLE_VAPIGEN
include Makefile.vapigen
endif
That is worked around by removing the "if", which however
requires us to remove the error check in Makefile.vapigen.
2016-10-21 17:37:57 +02:00
Thomas Haller
b0f4e25782
build: merge "docs/Makefile.am" into toplevel Makefile
2016-10-21 17:37:57 +02:00
Thomas Haller
03e88d92a6
build: move nm.mk into main Makefile.am
2016-10-21 17:37:57 +02:00
Thomas Haller
2296db22c8
build: merge "man/Makefile.am" into toplevel Makefile
2016-10-21 17:37:57 +02:00
Thomas Haller
0f09b1d1cc
build: merge "libnm-glib/tests/Makefile.am" into toplevel Makefile
2016-10-21 17:37:57 +02:00
Thomas Haller
8027e09be4
build: merge "libnm-glib/Makefile.am" into toplevel Makefile
2016-10-21 17:37:57 +02:00
Thomas Haller
7c66a6be17
build: merge "libnm-util/tests/Makefile.am" into toplevel Makefile
2016-10-21 17:37:57 +02:00
Thomas Haller
fa0acb2042
build: merge "libnm-util/Makefile.am" into toplevel Makefile
2016-10-21 17:37:57 +02:00
Thomas Haller
8fa3314736
build: merge "data/Makefile.am" into toplevel Makefile
2016-10-21 17:37:57 +02:00
Thomas Haller
586e830e05
build: merge "clients/tui/Makefile.am" into toplevel Makefile
2016-10-21 17:37:56 +02:00
Thomas Haller
2238ccb48b
travis: run tests in parallel
2016-10-21 17:37:56 +02:00
Thomas Haller
c8a25001f4
build: merge "clients/cli/Makefile.am" into toplevel Makefile
2016-10-21 17:37:56 +02:00
Thomas Haller
f63a5a2a0d
build: merge "clients/Makefile.am" into toplevel Makefile
2016-10-21 17:37:56 +02:00
Thomas Haller
7fab25711a
build: merge "dispatcher/tests/Makefile.am" into toplevel Makefile
2016-10-21 17:37:56 +02:00
Thomas Haller
6f19ccdd58
build: merge "dispatcher/Makefile.am" into toplevel Makefile
2016-10-21 17:04:06 +02:00
Thomas Haller
7bf4a15504
build: merge "src/tests/Makefile.am" into toplevel Makefile
2016-10-21 17:04:06 +02:00
Thomas Haller
1d8934e705
build: merge "src/tests/config/Makefile.am" into toplevel Makefile
2016-10-21 17:04:06 +02:00
Thomas Haller
a0bb990f39
build: merge "src/supplicant-manager/tests/Makefile.am" into toplevel Makefile
2016-10-21 17:04:06 +02:00
Thomas Haller
e52a5e1146
build: merge "src/rdisc/tests/Makefile.am" into toplevel Makefile
2016-10-21 17:04:06 +02:00
Thomas Haller
f3437707e3
build: merge "src/devices/tests/Makefile.am" into toplevel Makefile
2016-10-21 17:04:06 +02:00
Thomas Haller
04eb0afd28
build: merge "src/platform/tests/Makefile.am" into toplevel Makefile
2016-10-21 17:04:06 +02:00
Thomas Haller
123b66b9f4
build: merge "src/dnsmasq-manager/tests/Makefile.am" into toplevel Makefile
2016-10-21 17:04:06 +02:00
Thomas Haller
ecb9f140cf
build: merge "src/devices/team/Makefile.am" into toplevel Makefile
2016-10-21 17:04:06 +02:00
Thomas Haller
eecd05b5bf
build: merge "src/devices/wifi/tests/Makefile.am" into toplevel Makefile
2016-10-21 17:04:06 +02:00
Thomas Haller
da006929dd
build: merge "src/devices/wifi/Makefile.am" into toplevel Makefile
2016-10-21 17:04:06 +02:00
Thomas Haller
ee601ff296
build: merge "src/devices/bluetooth/Makefile.am" into toplevel Makefile
2016-10-21 17:04:06 +02:00
Thomas Haller
72d53e4b69
build: merge "src/devices/wwan/Makefile.am" into toplevel Makefile
2016-10-21 17:04:06 +02:00
Thomas Haller
ca7f59d332
build: merge "src/devices/adsl/Makefile.am" into toplevel Makefile
2016-10-21 17:04:06 +02:00
Thomas Haller
b48b56c499
build: merge "src/settings/plugins/ifnet/tests/Makefile.am" into toplevel Makefile
2016-10-21 17:04:05 +02:00
Thomas Haller
b2d4180787
build: merge "src/settings/plugins/ifnet/Makefile.am" into toplevel Makefile
2016-10-21 16:47:03 +02:00
Thomas Haller
b661b17687
build: merge "src/settings/plugins/ifupdown/tests/Makefile.am" into toplevel Makefile
2016-10-21 16:47:03 +02:00
Thomas Haller
4128d837ac
build: merge "src/settings/plugins/ifupdown/Makefile.am" into toplevel Makefile
2016-10-21 16:47:03 +02:00
Thomas Haller
2169a09f07
build: merge "src/settings/plugins/ifcfg-rh/tests/Makefile.am" into toplevel Makefile
2016-10-21 16:47:02 +02:00
Thomas Haller
181dfe17d8
build: merge "src/settings/plugins/ifcfg-rh/Makefile.am" into toplevel Makefile
2016-10-19 17:16:08 +02:00
Thomas Haller
f9b6042441
build: merge "tools/Makefile.am" into toplevel Makefile
2016-10-19 17:16:08 +02:00
Thomas Haller
b4372070a6
build: always enable building of tests
...
Let's always build with tests, regardless of --enable-tests.
If the user builds with --enable-tests=no, we automake the tests
as check_PROGRAMS, which only compiles the tests during `make check`.
Otherwise, we automake them as noinst_PROGRAMS, which builds the
tests regularly as a normal build.
This way, a user who doesn't want to build the tests regularly,
still can build and run them via `make check`.
2016-10-19 17:16:08 +02:00
Thomas Haller
f87d153f8a
build: merge "src/settings/plugins/ibft/Makefile.am" into toplevel Makefile
2016-10-19 17:16:08 +02:00
Thomas Haller
541f543451
build: merge "src/settings/plugins/keyfile/Makefile.am" into toplevel Makefile
2016-10-19 17:16:08 +02:00
Thomas Haller
48058ff21f
build: merge "src/ppp-manager/Makefile.am" into toplevel Makefile
2016-10-19 17:16:08 +02:00
Thomas Haller
815624bf24
build: merge "src/dhcp-manager/tests/Makefile.am" into toplevel Makefile
2016-10-19 17:16:08 +02:00
Thomas Haller
481d2165e9
build: merge "src/dhcp-manager/Makefile.am" into toplevel Makefile
2016-10-19 17:16:08 +02:00
Thomas Haller
b219eb19f1
build: merge "src/Makefile.am" into toplevel Makefile
...
Had to rename "nm-enum-types.h" because it works badly with
"libnm/nm-enum-types.h". Maybe I could fix that differently,
but duplicate names is anyway error prone.
Note that "nm-core-enum-types.h" is already taken too, so
"nm-src-enum-types.h" it is.
2016-10-19 17:16:08 +02:00
Thomas Haller
7aefbcb622
build: merge "libnm/tests/Makefile.am" into toplevel Makefile
2016-10-19 17:16:08 +02:00
Thomas Haller
9061432d55
build: merge "libnm/Makefile.am" into toplevel Makefile
2016-10-19 17:16:07 +02:00
