Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: timvideos/gst-switch
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 00da70884b9c
Choose a base ref
...
head repository: timvideos/gst-switch
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5297e239ee6f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 5, 2015

  1. Change to directory rather than using -C so ${PWD} is correct. 

    ${PWD} is used in python-api/Makefile to set the PYTHONPATH. When using -C the
value of PWD remains the top level directory rather than the python-api
directory leading to import-errors when running pylint.
    @mithro
    mithro committed May 5, 2015
    Copy the full SHA
    9dfce30 View commit details

Commits on May 6, 2015

  1. Merge pull request #215 from mithro/makefile-fix 

    Change to directory rather than using -C so ${PWD} is correct.
    @MaZderMind
    MaZderMind committed May 6, 2015
    Copy the full SHA
    5297e23 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 Makefile.am
4 changes: 2 additions & 2 deletions Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -9,8 +9,8 @@ test:
make style unittests integration

# TODO: Use configure to detect Python versions currently installed
make PYTHONVERSION=2.7 -Cpython-api style unittests integration
make PYTHONVERSION=3.4 -Cpython-api style unittests integration
cd python-api; make PYTHONVERSION=2.7 style unittests integration
cd python-api; make PYTHONVERSION=3.4 style unittests integration

demo: $(UI_TESTS)