Changeset 19986

Show
Ignore:
Timestamp:
04/21/07 16:07:32 (2 years ago)
Author:
patrick
Message:

Back out Revision 19985. It was meant for the 2.2 branch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/branches/2.0/modules/gadgeteer/drivers/gadget.driver.mk.in

    r19985 r19986  
    101101EXTRA_DEFS=             @DEFS@ -D_GADGET_DRIVER_BUILD_ 
    102102EXTRA_DEPENDFLAGS+=     @DEPEND_FLAGS@ $(EXTRA_INCLUDES) 
    103 EXTRA_INCLUDES+=        @INCLUDES@ $(shell flagpoll gadgeteer --cflags-only-I) 
     103EXTRA_INCLUDES+=        @INCLUDES@ $(shell gadgeteer-config --includes) 
    104104EXTRA_LDFLAGS+=         @LDFLAGS@ @EXTRA_LDFLAGS@ 
    105105EXTRA_LIBS+=            @LIBS@ 
    …… 
    129129endif 
    130130 
    131 DSO_DRIVER_DEPS=        $(shell flagpoll gadgeteer --libs) 
     131DSO_DRIVER_DEPS=        $(shell gadgeteer-config --libs)                \ 
     132                        $(shell gadgeteer-config --extra-libs) 
    132133 
    133134DRIVER_DSO=     $(DRIVER_NAME)_drv$(BUILD_TYPE_EXT).$(DYNAMICLIB_EXT) 

  • juggler/branches/2.0/modules/gadgeteer/plugins/gadget.plugin.mk.in

    r19985 r19986  
    104104EXTRA_DEFS=             @DEFS@ -D_GADGET_PLUGIN_BUILD_ 
    105105EXTRA_DEPENDFLAGS+=     @DEPEND_FLAGS@ $(EXTRA_INCLUDES) 
    106 EXTRA_INCLUDES+=        @INCLUDES@ $(shell flagpoll gadgeteer --cflags-only-I) 
     106EXTRA_INCLUDES+=        @INCLUDES@ $(shell gadgeteer-config --includes) 
    107107EXTRA_LDFLAGS+=         @LDFLAGS@ @EXTRA_LDFLAGS@ 
    108108EXTRA_LIBS+=            @LIBS@ 
    …… 
    132132endif 
    133133 
    134 DSO_PLUGIN_DEPS=        $(shell flagpoll gadgeteer --libs) 
     134DSO_PLUGIN_DEPS=        $(shell gadgeteer-config --libs)                \ 
     135                        $(shell gadgeteer-config --extra-libs) 
    135136 
    136137PLUGIN_DSO=     $(PLUGIN_NAME)$(BUILD_TYPE_EXT).$(DYNAMICLIB_EXT)