path: root/Makefile
diff options
authordscho <dscho>2001-09-25 11:58:24 +0000
committerdscho <dscho>2001-09-25 11:58:24 +0000
commit38cbc4b783f6935e2f2d0b2fa4395d9fe5c007a7 (patch)
tree747e31bfe49a23ae119cb7f834393d0901f03905 /Makefile
parent7074bbff92ba73b4bf67192acc3d7492c12f72ed (diff)
moved vncauth to libvncserver
Diffstat (limited to 'Makefile')
1 files changed, 14 insertions, 18 deletions
diff --git a/Makefile b/Makefile
index 11a652a..a8b404b 100644
--- a/Makefile
+++ b/Makefile
@@ -3,9 +3,8 @@ CFLAGS=-g -Wall
#CFLAGS=-O2 -Wall
-INCLUDES=-I. -Ilibvncauth -Iinclude
-# -Iinclude/X11 -Iinclude/Xserver
-VNCAUTHLIB=-Llibvncauth -lvncauth
+INCLUDES=-I. -Iinclude
VNCSERVERLIB=-L. -lvncserver -lz -ljpeg
# These two lines enable useage of PThreads
@@ -21,15 +20,15 @@ OSX_LIBS = -framework ApplicationServices -framework Carbon
SOURCES=main.c rfbserver.c miregion.c auth.c sockets.c xalloc.c \
stats.c corre.c hextile.c rre.c translate.c cutpaste.c \
- zlib.c tight.c httpd.c cursor.o
+ zlib.c tight.c httpd.c cursor.o \
+ d3des.c vncauth.c
OBJS=main.o rfbserver.o miregion.o auth.o sockets.o xalloc.o \
stats.o corre.o hextile.o rre.o translate.o cutpaste.o \
- zlib.o tight.o httpd.o cursor.o
+ zlib.o tight.o httpd.o cursor.o \
+ d3des.o vncauth.o
all: example pnmshow storepasswd
-$(OBJS): rfb.h
install_OSX: OSXvnc-server
cp OSXvnc-server storepasswd ../OSXvnc/build/
@@ -40,27 +39,24 @@ libvncserver.a: $(OBJS)
$(AR) cru $@ $(OBJS)
$(RANLIB) $@
-example: example.o libvncauth/libvncauth.a libvncserver.a
+example: example.o libvncserver.a
$(CC) -o example example.o $(LIBS)
-pnmshow: pnmshow.o libvncauth/libvncauth.a libvncserver.a
+pnmshow: pnmshow.o libvncserver.a
$(CC) -o pnmshow pnmshow.o $(LIBS)
-OSXvnc-server: mac.o libvncauth/libvncauth.a libvncserver.a
+OSXvnc-server: mac.o libvncserver.a
$(CC) -o OSXvnc-server mac.o $(LIBS) $(OSX_LIBS)
-storepasswd: storepasswd.o libvncauth/libvncauth.a
- $(CC) -o storepasswd storepasswd.o $(VNCAUTHLIB)
- (cd libvncauth; make)
+storepasswd: storepasswd.o d3des.o vncauth.o
+ $(CC) -o storepasswd storepasswd.o d3des.o vncauth.o
- rm -f $(OBJS) *~ core "#"* *.bak *.orig storepasswd.o *.a example.o \
- libvncauth/*.o libvncauth/*~ libvncauth/*.a
+ rm -f $(OBJS) *~ core "#"* *.bak *.orig storepasswd.o *.a $(OBJS)
realclean: clean
- rm -f OSXvnc-server storepasswd
+ rm -f OSXvnc-server storepasswd example pnmshow
$(CC) -M $(INCLUDES) $(SOURCES) >.depend