Ignore:
Timestamp:
Apr 13, 2012, 12:04:37 PM (13 years ago)
Author:
gah
Message:

sync back with trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/blt4/Makefile.in

    r2692 r2966  
    3131
    3232ENABLE_GUI      = @ENABLE_GUI@
    33 
     33HAVE_FFMPEG     = @HAVE_FFMPEG_LIBS@
    3434TARGETS         = src lang lib
    3535
    3636ifneq ($(ENABLE_GUI),)
    3737  TARGETS += gui builder tester examples
     38endif
     39ifeq ($(HAVE_FFMEG),)
     40  TARGETS += video
    3841endif
    3942
     
    4447          $(MAKE) -C $$i all || exit 1 ;\
    4548        done
    46 test: 
     49test:
    4750        $(MAKE) -C test all
    4851
Note: See TracChangeset for help on using the changeset viewer.