← Back to branch summary

~ubuntu-branches/ubuntu/lucid/wpasupplicant/lucid-updates

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Bazaar Package Importer
  • Author(s): Kel Modderman
  • Date: 2006-10-05 08:04:01 UTC
  • mfrom: (1.1.5 upstream) (3 etch)
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: james.westby@ubuntu.com-20061005080401-r8lqlix4390yos7b
Tags: 0.5.5-2
http://bugs.debian.org/388316
* Update madwifi headers to latest SVN. (Closes: #388316)
* Remove failed attempt at action locking. [debian/functions.sh,
  debian/wpa_action.sh]
* Add hysteresis checking functions, to avoid "event loops" while
  using wpa-roam. [debian/functions.sh, debian/wpa_action.sh]
* Change of co-maintainer email address.
* Add ishex() function to functions.sh to determine wpa-psk value type in
  plaintext or hex. This effectively eliminates the need for the bogus and
  somewhat confusing wpa-passphrase contruct specific to our scripts and
  allows wpa-psk to work with either a 8 to 63 character long plaintext
  string or 64 character long hex string.
* Adjust README.modes to not refer to the redundant wpa-passphrase stuff.
* Add big fat NOTE about acceptable wpa-psk's to top of example gallery.
* Strip surrounding quotes from wpa-ssid if present, instead of just whining
  about them.
* Update email address in copyright blurb of functions.sh, ifupdown.sh and
  wpa_action.sh.  

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
600
600
ifdef CONFIG_CTRL_IFACE
601
601
ifeq ($(CONFIG_CTRL_IFACE), y)
602
602
ifdef CONFIG_NATIVE_WINDOWS
603
 
CONFIG_CTRL_IFACE=udp
 
603
CONFIG_CTRL_IFACE=named_pipe
604
604
else
605
605
CONFIG_CTRL_IFACE=unix
606
606
endif
607
607
endif
608
608
CFLAGS += -DCONFIG_CTRL_IFACE
 
609
ifeq ($(CONFIG_CTRL_IFACE), unix)
 
610
CFLAGS += -DCONFIG_CTRL_IFACE_UNIX
 
611
endif
609
612
ifeq ($(CONFIG_CTRL_IFACE), udp)
610
613
CFLAGS += -DCONFIG_CTRL_IFACE_UDP
611
614
endif
 
615
ifeq ($(CONFIG_CTRL_IFACE), named_pipe)
 
616
CFLAGS += -DCONFIG_CTRL_IFACE_NAMED_PIPE
 
617
endif
612
618
OBJS += ctrl_iface.o ctrl_iface_$(CONFIG_CTRL_IFACE).o
613
619
endif
614
620
 
615
621
ifdef CONFIG_CTRL_IFACE_DBUS
616
 
CFLAGS += -DCONFIG_CTRL_IFACE_DBUS
617
 
OBJS += ctrl_iface_dbus.o
 
622
CFLAGS += -DCONFIG_CTRL_IFACE_DBUS -DDBUS_API_SUBJECT_TO_CHANGE
 
623
OBJS += ctrl_iface_dbus.o ctrl_iface_dbus_handlers.o dbus_dict_helpers.o
618
624
LIBS += `pkg-config --libs dbus-1`
619
625
CFLAGS += `pkg-config --cflags dbus-1`
620
626
endif
739
745
                -D$(*:eap_%=eap_peer_%)_register=eap_peer_method_dynamic_init
740
746
 
741
747
 
742
 
# parameters for Microsoft Visual C++ Toolkit 2003 compiler
743
 
CL=cl
744
 
CLDIR=C:\Program Files\Microsoft Visual C++ Toolkit 2003
745
 
PSDKDIR=C:\Program Files\Microsoft Platform SDK for Windows XP SP2
746
 
CLFLAGS=-O
747
 
CLLIBS=wbemuuid.lib libcmt.lib kernel32.lib uuid.lib ole32.lib oleaut32.lib \
748
 
        ws2_32.lib
749
 
 
750
 
ndis_events: ndis_events.cpp
751
 
        INCLUDE="$(CLDIR)\include;$(PSDKDIR)\Include" \
752
 
        LIB="$(CLDIR)\lib;$(PSDKDIR)\Lib" \
753
 
        $(CL) $(CLFLAGS) -o ndis_events.exe ndis_events.cpp \
754
 
                /link -nodefaultlib $(CLLIBS)
755
 
 
756
748
wpa_supplicant.exe: wpa_supplicant
757
749
        mv -f $< $@
758
750
wpa_cli.exe: wpa_cli