[vitunes-commits] [ryanflannery/vitunes] 20596b: Simplify Linux Makefile

  • From: Ryan Flannery <ryan.flannery@xxxxxxxxx>
  • To: vitunes-commits@xxxxxxxxxxxxx
  • Date: Mon, 16 Jan 2012 14:19:27 -0800

  Branch: refs/heads/gstreamer
  Home:   https://github.com/ryanflannery/vitunes
  Commit: 20596ba105ac97d6ba0ff9abe64873022142a475
      
https://github.com/ryanflannery/vitunes/commit/20596ba105ac97d6ba0ff9abe64873022142a475
  Author: Ryan Flannery <ryan.flannery@xxxxxxxxx>
  Date:   2012-01-15 (Sun, 15 Jan 2012)

  Changed paths:
    M Makefile.linux

  Log Message:
  -----------
  Simplify Linux Makefile

Should make maintaining both much easier.


  Commit: 737015c3c05ebfcc71c5193fba6d06601c8ac058
      
https://github.com/ryanflannery/vitunes/commit/737015c3c05ebfcc71c5193fba6d06601c8ac058
  Author: Ryan Flannery <ryan.flannery@xxxxxxxxx>
  Date:   2012-01-15 (Sun, 15 Jan 2012)

  Changed paths:
    M commands.c
  M paint.c

  Log Message:
  -----------
  Remove warnings in Linux build

Switch to using ncurses function getmaxx(3) when only needing the
width of a curses screen.


  Commit: 59bcad438fe5493099986ec4262cdc47ea56e47e
      
https://github.com/ryanflannery/vitunes/commit/59bcad438fe5493099986ec4262cdc47ea56e47e
  Author: Ryan Flannery <ryan.flannery@xxxxxxxxx>
  Date:   2012-01-15 (Sun, 15 Jan 2012)

  Changed paths:
    M commands.c
  M paint.c

  Log Message:
  -----------
  Merge branch 'master' into linux


  Commit: 08f188d1dbec1e0f14f84676933b782c57889ec2
      
https://github.com/ryanflannery/vitunes/commit/08f188d1dbec1e0f14f84676933b782c57889ec2
  Author: Ryan Flannery <ryan.flannery@xxxxxxxxx>
  Date:   2012-01-15 (Sun, 15 Jan 2012)

  Changed paths:
    M players/mplayer.h

  Log Message:
  -----------
  Remove warning on Linux build

Adding time.h to mplayer includes.


  Commit: 9ab2ad3a922b224ee48d3107ac2e9334e5c4421a
      
https://github.com/ryanflannery/vitunes/commit/9ab2ad3a922b224ee48d3107ac2e9334e5c4421a
  Author: Ryan Flannery <ryan.flannery@xxxxxxxxx>
  Date:   2012-01-15 (Sun, 15 Jan 2012)

  Changed paths:
    M players/mplayer.h

  Log Message:
  -----------
  Merge branch 'master' into linux


  Commit: 7496895dc06ee5da691903fd0726da1ba7f05428
      
https://github.com/ryanflannery/vitunes/commit/7496895dc06ee5da691903fd0726da1ba7f05428
  Author: Ryan Flannery <ryan.flannery@xxxxxxxxx>
  Date:   2012-01-15 (Sun, 15 Jan 2012)

  Changed paths:
    M playlist.c

  Log Message:
  -----------
  Plug memory leak in with playlists history

Fix memory leak when free()'ing playlists.  Previously I didn't free()
the array allocated to store the history (changeset) of a given
playlist.  This corrects that behavior.


  Commit: 4c8df8b3fc00c1cdeca9b00808ab6e2e217e248f
      
https://github.com/ryanflannery/vitunes/commit/4c8df8b3fc00c1cdeca9b00808ab6e2e217e248f
  Author: Ryan Flannery <ryan.flannery@xxxxxxxxx>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M Makefile
  M Makefile.linux

  Log Message:
  -----------
  Add $(INSTALL) variable to Makefile

Helps on Linux where an INSTALL variable isn't setup by default
like on *bsd.  Also just makes sense.


  Commit: 80fd17e8cc3f1c9f78d86c4bc71093505df044ed
      
https://github.com/ryanflannery/vitunes/commit/80fd17e8cc3f1c9f78d86c4bc71093505df044ed
  Author: Ryan Flannery <ryan.flannery@xxxxxxxxx>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M Makefile.linux
  M commands.h
  M compat.h
  M e_commands.h
  M keybindings.h
  M medialib.h
  M meta_info.h
  M paint.h
  M player.h
  M players/mplayer.h
  M players/player_utils.h
  M playlist.h
  M str2argv.h
  M uinterface.h
  M vitunes.h

  Log Message:
  -----------
  Move handling of _GNU_SOURCE into compat.h

Instead of handling #define'ing _GNU_SOURCE on linux in the Makefile,
move it into compat.h.

First, this is more intuitive and consistent with our handling of
build compatibility issues between bsd's & linux.  Second, this moves
us closer to removing a separate linux Makefile.


  Commit: ebff1bdb46cd797382e53661255c708d7108b343
      
https://github.com/ryanflannery/vitunes/commit/ebff1bdb46cd797382e53661255c708d7108b343
  Author: Ryan Flannery <ryan.flannery@xxxxxxxxx>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M Makefile
  M Makefile.linux

  Log Message:
  -----------
  Move VPATH spec into common Makefile

With BSD make, one uses ".PATH: dir1 dir2 ..." to specify additional
directories make should look in.  With GNU make, the syntax is
"VPATH = dir1 dir2 ...".

Since BSD make will just interpret "VPATH = ..." as an unused variable
declaration, it should be safe to include there.


  Commit: 28e8d268ad0d80112dbc1be39095cbc78de2a076
      
https://github.com/ryanflannery/vitunes/commit/28e8d268ad0d80112dbc1be39095cbc78de2a076
  Author: Ryan Flannery <ryan.flannery@xxxxxxxxx>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M Makefile
  R Makefile.linux

  Log Message:
  -----------
  Let 'install' be picked up in $PATH in Makefile

This also removes the need to maintain a Linux-specific Makefile.
Joy.


  Commit: f45d3206db433c370081c8b8afb61c74397880d0
      
https://github.com/ryanflannery/vitunes/commit/f45d3206db433c370081c8b8afb61c74397880d0
  Author: Ryan Flannery <ryan.flannery@xxxxxxxxx>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M compat.h
  M playlist.h

  Log Message:
  -----------
  Only include ligben.h for OpenBSD builds

This causes a warning about basename(3) on Linux, where basename(3)
should come from string.h (rather than libgen.h) when _GNU_SOURCE is
defined.


  Commit: c8b93238fa9c0a7377e5526d06d3d1b9baaf40d5
      
https://github.com/ryanflannery/vitunes/commit/c8b93238fa9c0a7377e5526d06d3d1b9baaf40d5
  Author: Ryan Flannery <ryan.flannery@xxxxxxxxx>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M playlist.c

  Log Message:
  -----------
  Vary glob_t count type based on OS

On linux it's a size_t, on OpenBSD it's an int.  Compatability goo,
but it gets the Linux build to 0 warnings and helps with some of the
static analysis tools.


  Commit: cc7f9464b04bef13e8824a92efb8f0da7cb51151
      
https://github.com/ryanflannery/vitunes/commit/cc7f9464b04bef13e8824a92efb8f0da7cb51151
  Author: Ryan Flannery <ryan.flannery@xxxxxxxxx>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M Makefile
  R Makefile.linux
  M commands.c
  M commands.h
  M compat.h
  M e_commands.h
  M keybindings.h
  M medialib.h
  M meta_info.h
  M paint.c
  M paint.h
  M player.h
  M players/mplayer.h
  M players/player_utils.h
  M playlist.c
  M playlist.h
  M str2argv.h
  M uinterface.h
  M vitunes.h

  Log Message:
  -----------
  Merge branch 'linux' into gstreamer

Conflicts:
        Makefile.linux


Compare: https://github.com/ryanflannery/vitunes/compare/8495be5...cc7f946

Other related posts: