diff options
author | Haakon Nessjoen <haakon.nessjoen@gmail.com> | 2010-11-02 13:02:30 +0100 |
---|---|---|
committer | Haakon Nessjoen <haakon.nessjoen@gmail.com> | 2010-11-02 13:02:30 +0100 |
commit | a0316461bda85882821a1777a88953797f78292c (patch) | |
tree | e865b45b8ef5282707c695da697ba911987bee18 /Makefile | |
parent | 7f6c0cd059d6d913842f625da204801f9c5b67f1 (diff) | |
parent | a993f53f4ab8e08bfa2c198d9375f85686e87c9f (diff) | |
download | MAC-Telnet-a0316461bda85882821a1777a88953797f78292c.tar.gz MAC-Telnet-a0316461bda85882821a1777a88953797f78292c.zip |
Merge remote branch 'origin/master' into mactelnet-osx
Conflicts:
mactelnet.c
mactelnetd.c
protocol.c
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -14,11 +14,11 @@ install: all chown $(DESTDIR)/etc/mactelnetd.users chmod 600 $(DESTDIR)/etc/mactelnetd.users -mactelnet: config.h udp.h udp.c mactelnet.c protocol.c protocol.h console.c console.h devices.c devices.h - gcc -g -DUSERSFILE='"/etc/mactelnetd.users"' -o mactelnet -lcrypto mactelnet.c udp.c protocol.c console.c devices.c +mactelnet: config.h udp.h udp.c mactelnet.c protocol.c protocol.h console.c console.h devices.c devices.h md5.h + gcc -g -DUSERSFILE='"/etc/mactelnetd.users"' -o mactelnet mactelnet.c udp.c protocol.c console.c devices.c md5.c -mactelnetd: config.h mactelnetd.c udp.h udp.c protocol.c protocol.h console.c console.h users.c users.h - gcc -g -DUSERSFILE='"/etc/mactelnetd.users"' -o mactelnetd -lcrypto mactelnetd.c udp.c protocol.c console.c users.c +mactelnetd: config.h mactelnetd.c udp.h udp.c protocol.c protocol.h console.c console.h users.c users.h md5.h + gcc -g -DUSERSFILE='"/etc/mactelnetd.users"' -o mactelnetd mactelnetd.c udp.c protocol.c console.c users.c md5.c mndp: config.h mndp.c protocol.h - gcc -g -o mndp mndp.c + gcc -g -o mndp mndp.c protocol.c |