Changeset 89db90e for Makefile


Ignore:
Timestamp:
2015-03-12T09:10:16Z (10 years ago)
Author:
dequis <dx@…>
Children:
fc650a8
Parents:
0e4c3dd (diff), 3bb333c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'develop' into feat/hip-cat

File:
1 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r0e4c3dd r89db90e  
    2525
    2626doc:
     27ifdef DOC
    2728        $(MAKE) -C doc
     29endif
    2830
    2931uninstall: uninstall-bin uninstall-doc
    … …  
    7375
    7476install-doc:
     77ifdef DOC
    7578        $(MAKE) -C doc install
     79endif
    7680ifdef SKYPE_PI
    7781        $(MAKE) -C protocols/skype install-doc
    … …  
    7983
    8084uninstall-doc:
     85ifdef DOC
    8186        $(MAKE) -C doc uninstall
     87endif
    8288ifdef SKYPE_PI
    8389        $(MAKE) -C protocols/skype uninstall-doc
Note: See TracChangeset for help on using the changeset viewer.