projects / packages / rdesktop.git / blame
| Commit | Line | Data |
|---|---|---|
| d97cf291 JB |
1 | --- rdesktop-1.1.0/Makefile.orig Fri Jun 14 11:24:24 2002 |
| 2 | +++ rdesktop-1.1.0/Makefile Fri Jun 14 11:37:52 2002 | |
| 3 | @@ -7,7 +7,7 @@ | |
| 4 | # Configuration defaults | |
| 5 | ||
| 6 | CC = gcc | |
| 7 | -CFLAGS = -O2 -Wall | |
| 8 | +CFLAGS = $(CFLAGSOPT) -Wall | |
| 9 | INCLUDES = -I$(shell pwd) | |
| 10 | LDLIBS = | |
| 11 | ||
| 12 | @@ -92,7 +92,7 @@ | |
| 13 | ||
| 14 | include Makeconf # local configuration | |
| 15 | ||
| 16 | -all: localendian.h rdesktop | |
| 17 | +all: localendian.h rdesktop rdp-srvr | |
| 18 | ||
| 19 | localendian.h: endian | |
| 20 | rm -f localendian.h | |
| 21 | @@ -102,29 +102,24 @@ | |
| 22 | $(CC) -o tests/endian tests/endian.c | |
| 23 | ||
| 24 | rdesktop: $(RDPOBJ) $(SSL_OBJ) ${GUI_OBJ} ${GNUOBJ} | |
| 25 | - $(CC) $(CFLAGS) -o rdesktop $(RDPOBJ) $(SSL_OBJ) $(LDDIRS) $(LDLIBS) ${GNUOBJ} ${GUI_OBJ} ${GUI_LIBS} ${SSL_LIBS} | |
| 26 | + $(CC) $(CFLAGS) $(LDFLAGSOPT) -o rdesktop $(RDPOBJ) $(SSL_OBJ) $(LDDIRS) $(LDLIBS) ${GNUOBJ} ${GUI_OBJ} ${GUI_LIBS} ${SSL_LIBS} | |
| 27 | ||
| 28 | rdp-srvr: $(RDPSOBJ) ${SSL_OBJ} ${GUI_OBJ} $(GNUOBJ) | |
| 29 | - $(CC) $(CFLAGS) -o rdp-srvr $(RDPSOBJ) $(SSL_OBJ) $(LDDIRS) $(LDLIBS) ${GNUOBJ} ${GUI_OBJ} ${GUI_LIBS} ${SSL_LIBS} | |
| 30 | + $(CC) $(CFLAGS) $(LDFLAGSOPT) -o rdp-srvr $(RDPSOBJ) $(SSL_OBJ) $(LDDIRS) $(LDLIBS) ${GNUOBJ} ${GUI_OBJ} ${GUI_LIBS} ${SSL_LIBS} | |
| 31 | ||
| 32 | Makeconf: | |
| 33 | ./configure | |
| 34 | ||
| 35 | -install: installbin | |
| 36 | +install: installbin installman | |
| 37 | ||
| 38 | installbin: rdesktop rdp-srvr | |
| 39 | - mkdir -p $(BINDIR) | |
| 40 | - cp rdesktop $(BINDIR) | |
| 41 | - cp rdp-srvr $(BINDIR) | |
| 42 | - strip $(BINDIR)/rdesktop | |
| 43 | - strip $(BINDIR)/rdp-srvr | |
| 44 | - chmod 755 $(BINDIR)/rdesktop | |
| 45 | - chmod 755 $(BINDIR)/rdp-srvr | |
| 46 | + install -d $(DESTDIR)$(BINDIR) | |
| 47 | + install -m755 rdesktop $(DESTDIR)$(BINDIR) | |
| 48 | + install -m755 rdp-srvr $(DESTDIR)$(BINDIR) | |
| 49 | ||
| 50 | installman: rdesktop.1 | |
| 51 | - mkdir -p $(MANDIR)/man1 | |
| 52 | - cp rdesktop.1 $(MANDIR)/man1 | |
| 53 | - chmod 755 $(MANDIR)/man1/rdesktop.1 | |
| 54 | + install -d $(DESTDIR)$(MANDIR)/man1 | |
| 55 | + install -m644 rdesktop.1 $(DESTDIR)$(MANDIR)/man1 | |
| 56 | ||
| 57 | proto: | |
| 58 | cproto -DMAKE_PROTO -o proto.h *.c |