Commit graph

2 commits

Author SHA1 Message Date
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 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
Renamed from vapi/Makefile.vapigen (Browse further)