From 2189024ef820c6441898be43ab4ef96567ef8028 Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Thu, 23 Jan 1997 11:06:13 +0000 Subject: [PATCH] EXECSUFFIX-garbage for os2 stange file names git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1183 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/ftp/common/Makefile.in | 14 ++++++++++---- appl/ftp/ftp/Makefile.in | 5 +++-- appl/ftp/ftpd/Makefile.in | 9 +++++---- appl/kx/Makefile.in | 9 +++++---- appl/otp/Makefile.in | 9 +++++---- appl/popper/Makefile.in | 5 +++-- appl/telnet/libtelnet/Makefile.in | 13 +++++++++---- appl/telnet/telnet/Makefile.in | 9 +++++---- appl/telnet/telnetd/Makefile.in | 9 +++++---- appl/xnlock/Makefile.in | 5 +++-- lib/des/Makefile.in | 25 +++++++++++++++---------- lib/otp/Makefile.in | 9 +++++---- 12 files changed, 73 insertions(+), 48 deletions(-) diff --git a/appl/ftp/common/Makefile.in b/appl/ftp/common/Makefile.in index d802d7edb..7a75aa333 100644 --- a/appl/ftp/common/Makefile.in +++ b/appl/ftp/common/Makefile.in @@ -21,14 +21,20 @@ OBJECTS = $(libcommon_OBJS) libcommon_OBJS = base64.o glob.o -all: libcommon.a +LIBNAME = $(LIBPREFIX)common +LIBEXT = @LIBEXT@ +LIBPREFIX = @LIBPREFIX@ +LIB = $(LIBNAME).$(LIBEXT) + +all: $(LIB) .c.o: $(CC) -c $(CFLAGS) -I$(srcdir) -I../../../include -I../../.. $(DEFS) $< -libcommon.a: $(libcommon_OBJS) - ar cr libcommon.a $(libcommon_OBJS) - $(RANLIB) libcommon.a +$(LIB): $(libcommon_OBJS) + rm -f $@ + ar cr $@ $(libcommon_OBJS) + -$(RANLIB) $@ install: diff --git a/appl/ftp/ftp/Makefile.in b/appl/ftp/ftp/Makefile.in index 6598d7473..d4755c16f 100644 --- a/appl/ftp/ftp/Makefile.in +++ b/appl/ftp/ftp/Makefile.in @@ -23,6 +23,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ transform=@program_transform_name@ +EXECSUFFIX=@EXECSUFFIX@ ATHENA = ../../.. @@ -30,7 +31,7 @@ INCTOP = $(ATHENA)/include LIBTOP = $(ATHENA)/lib -PROGS = ftp +PROGS = ftp$(EXECSUFFIX) ftp_OBJS = cmds.o cmdtab.o ftp.o krb4.o main.o ruserpass.o domacro.o \ globals.o kauth.o @@ -57,7 +58,7 @@ uninstall: rm -f $(bindir)/`echo $$x | sed '$(transform)'`; \ done -ftp: $(ftp_OBJS) # ../common/libcommon.a +ftp$(EXECSUFFIX): $(ftp_OBJS) # ../common/libcommon.a $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(ftp_OBJS) ../common/libcommon.a -L$(LIBTOP)/krb -lkrb -L$(LIBTOP)/des -ldes -L$(LIBTOP)/roken -lroken $(LIBS) -L$(LIBTOP)/roken -lroken TAGS: $(SOURCES) diff --git a/appl/ftp/ftpd/Makefile.in b/appl/ftp/ftpd/Makefile.in index 064b54690..7df789379 100644 --- a/appl/ftp/ftpd/Makefile.in +++ b/appl/ftp/ftpd/Makefile.in @@ -26,6 +26,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ libexecdir = @libexecdir@ transform=@program_transform_name@ +EXECSUFFIX=@EXECSUFFIX@ ATHENA = ../../.. @@ -39,7 +40,7 @@ LIBDES = -L$(LIBTOP)/des -ldes LIBOTP = -L$(LIBTOP)/otp -lotp LIBROKEN= -L$(LIBTOP)/roken -lroken -PROGS = ftpd +PROGS = ftpd$(EXECSUFFIX) ftpd_SOURCES = ftpd.c ftpcmd.c logwtmp.c popen.c auth.c krb4.c kauth.c ftpd_OBJS = ftpd.o ftpcmd.o logwtmp.o popen.o auth.o krb4.o kauth.o @@ -47,7 +48,7 @@ ftpd_OBJS = ftpd.o ftpcmd.o logwtmp.o popen.o auth.o krb4.o kauth.o SOURCES = $(ftpd_SOURCES) OBJECTS = $(ftpd_OBJS) -all: ftpd +all: $(PROGS) .c.o: $(CC) -c $(CFLAGS) -I$(srcdir) -I../../.. -I$(srcdir)/../common -I$(INCTOP) $(DEFS) $< @@ -63,8 +64,8 @@ uninstall: rm -f $(libexecdir)/`echo $$x | sed '$(transform)'`; \ done -ftpd: $(ftpd_OBJS) - $(CC) $(LD_FLAGS) $(LDFLAGS) -o ftpd $(ftpd_OBJS) ../common/libcommon.a $(LIBKAFS) $(LIBKRB) $(LIBOTP) $(LIBDES) $(LIBROKEN) $(LIBS) $(LIBROKEN) +ftpd$(EXECSUFFIX): $(ftpd_OBJS) + $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(ftpd_OBJS) ../common/libcommon.a $(LIBKAFS) $(LIBKRB) $(LIBOTP) $(LIBDES) $(LIBROKEN) $(LIBS) $(LIBROKEN) ftpcmd.c: ftpcmd.y $(YACC) $(YFLAGS) $< diff --git a/appl/kx/Makefile.in b/appl/kx/Makefile.in index 053e6105d..73c9425e7 100644 --- a/appl/kx/Makefile.in +++ b/appl/kx/Makefile.in @@ -24,9 +24,10 @@ libdir = @libdir@ libexecdir = @libexecdir@ bindir = @bindir@ transform=@program_transform_name@ +EXECSUFFIX=@EXECSUFFIX@ -X_PROGS_BIN = kx rxterm rxtelnet -X_PROGS_LIBEXEC = kxd +X_PROGS_BIN = kx$(EXECSUFFIX) rxterm rxtelnet +X_PROGS_LIBEXEC = kxd$(EXECSUFFIX) PROG_BIN = @MAKE_X_PROGS_BIN@ PROG_LIBEXEC = @MAKE_X_PROGS_LIBEXEC@ @@ -92,10 +93,10 @@ dist: $(DISTFILES) KLIB= -L../../lib/krb -lkrb -L../../lib/des -ldes LIBROKEN=-L../../lib/roken -lroken -kx: $(OBJECTS_KX) +kx$(EXECSUFFIX): $(OBJECTS_KX) $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_KX) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN) -kxd: $(OBJECTS_KXD) +kxd$(EXECSUFFIX): $(OBJECTS_KXD) $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_KXD) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN) rxterm: rxterm.in diff --git a/appl/otp/Makefile.in b/appl/otp/Makefile.in index dd6e2fdbc..01267634e 100644 --- a/appl/otp/Makefile.in +++ b/appl/otp/Makefile.in @@ -22,9 +22,10 @@ libdir = @libdir@ libexecdir = @libexecdir@ bindir = @bindir@ transform=@program_transform_name@ +EXECSUFFIX=@EXECSUFFIX@ -PROG_SUIDBIN = otp -PROG_BIN = otpprint +PROG_SUIDBIN = otp$(EXECSUFFIX) +PROG_BIN = otpprint$(EXECSUFFIX) PROGS = $(PROG_BIN) $(PROG_SUIDBIN) SOURCES_OTP = otp.c @@ -77,10 +78,10 @@ realclean: distclean OLIB=-L../../lib/otp -lotp -L../../lib/des -ldes LIBROKEN=-L../../lib/roken -lroken -otp: $(OBJECTS_OTP) +otp$(EXECSUFFIX): $(OBJECTS_OTP) $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_OTP) $(OLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN) -otpprint: $(OBJECTS_OTPPRINT) +otpprint$(EXECSUFFIX): $(OBJECTS_OTPPRINT) $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS_OTPPRINT) $(OLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN) $(OBJECTS): ../../config.h diff --git a/appl/popper/Makefile.in b/appl/popper/Makefile.in index 342414db8..8a11f8304 100644 --- a/appl/popper/Makefile.in +++ b/appl/popper/Makefile.in @@ -22,9 +22,10 @@ libdir = @libdir@ bindir = @bindir@ libexecdir = @libexecdir@ transform=@program_transform_name@ +EXECSUFFIX=@EXECSUFFIX@ PROG_BIN = -PROG_LIBEXEC = popper +PROG_LIBEXEC = popper$(EXECSUFFIX) PROGS = $(PROG_BIN) $(PROG_LIBEXEC) SOURCES = \ @@ -88,7 +89,7 @@ KLIB=-L../../lib/krb -lkrb -L../../lib/des -ldes LIBROKEN=-L../../lib/roken -lroken OTPLIB=-L../../lib/otp -lotp -popper: $(OBJECTS) +popper$(EXECSUFFIX): $(OBJECTS) $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(OTPLIB) $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN) $(OBJECTS): ../../config.h diff --git a/appl/telnet/libtelnet/Makefile.in b/appl/telnet/libtelnet/Makefile.in index 8e91c52b3..e7994cdf7 100644 --- a/appl/telnet/libtelnet/Makefile.in +++ b/appl/telnet/libtelnet/Makefile.in @@ -11,6 +11,10 @@ AR = ar RANLIB = @RANLIB@ DEFS = @DEFS@ CFLAGS = @CFLAGS@ +LIBNAME = $(LIBPREFIX)telnet +LIBEXT = @LIBEXT@ +LIBPREFIX = @LIBPREFIX@ +LIB = $(LIBNAME).$(LIBEXT) prefix = @prefix@ @@ -18,16 +22,17 @@ SOURCES=auth.c encrypt.c genget.c enc_des.c misc.c kerberos.c read_password.c OBJECTS=auth.o encrypt.o genget.o enc_des.o misc.o kerberos.o read_password.o -all: libtelnet.a +all: $(LIB) libtop = @libtop@ .c.o: $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) -I../../../include -I../../.. -I$(srcdir)/.. $< -libtelnet.a: $(OBJECTS) - $(AR) cr libtelnet.a $(OBJECTS) - $(RANLIB) libtelnet.a +$(LIB): $(OBJECTS) + rm -f $@ + $(AR) cr $@ $(OBJECTS) + -$(RANLIB) $@ install: @true diff --git a/appl/telnet/telnet/Makefile.in b/appl/telnet/telnet/Makefile.in index 7cd474724..d94d54784 100644 --- a/appl/telnet/telnet/Makefile.in +++ b/appl/telnet/telnet/Makefile.in @@ -17,12 +17,13 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs -PROGS = telnet +PROGS = telnet$(EXECSUFFIX) prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ transform=@program_transform_name@ +EXECSUFFIX=@EXECSUFFIX@ SOURCES=authenc.c commands.c main.c network.c ring.c \ sys_bsd.c telnet.c terminal.c \ @@ -40,13 +41,13 @@ LIBROKEN = -L../../../lib/roken -lroken KLIB=$(LIBKRB) $(LIBDES) -all: telnet +all: $(PROGS) .c.o: $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) -I../../../include -I.. -I../../.. -I$(srcdir)/.. $< -telnet: $(OBJECTS) - $(CC) $(LD_FLAGS) $(LDFLAGS) -o telnet $(OBJECTS) ../libtelnet/libtelnet.a $(KLIB) $(LIBROKEN) $(LIBS) @LIB_tgetent@ @LIB_setupterm@ $(LIBROKEN) +telnet$(EXECSUFFIX): $(OBJECTS) + $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS) ../libtelnet/libtelnet.a $(KLIB) $(LIBROKEN) $(LIBS) @LIB_tgetent@ @LIB_setupterm@ $(LIBROKEN) install: all $(MKINSTALLDIRS) $(bindir) diff --git a/appl/telnet/telnetd/Makefile.in b/appl/telnet/telnetd/Makefile.in index 414ce6cb5..3c16444da 100644 --- a/appl/telnet/telnetd/Makefile.in +++ b/appl/telnet/telnetd/Makefile.in @@ -23,8 +23,9 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ libexecdir = @libexecdir@ transform=@program_transform_name@ +EXECSUFFIX=@EXECSUFFIX@ -PROGS = telnetd +PROGS = telnetd$(EXECSUFFIX) SOURCES=telnetd.c state.c termstat.c slc.c sys_term.c \ utility.c global.c authenc.c @@ -42,13 +43,13 @@ LIBROKEN = -L../../../lib/roken -lroken KLIB=$(LIBKAFS) $(LIBKRB) $(LIBDES) -all: telnetd +all: $(PROGS) .c.o: $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) -I../../../include -I.. -I../../.. -I$(srcdir)/.. -I. -I$(srcdir) $< -telnetd: $(OBJECTS) - $(CC) $(LD_FLAGS) $(LDFLAGS) -o telnetd $(OBJECTS) ../libtelnet/libtelnet.a $(KLIB) $(LIBROKEN) $(LIBS) @LIB_tgetent@ $(LIBROKEN) +telnetd$(EXECSUFFIX): $(OBJECTS) + $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OBJECTS) ../libtelnet/libtelnet.a $(KLIB) $(LIBROKEN) $(LIBS) @LIB_tgetent@ $(LIBROKEN) install: all $(MKINSTALLDIRS) $(libexecdir) diff --git a/appl/xnlock/Makefile.in b/appl/xnlock/Makefile.in index 8bc774513..95828ed2c 100644 --- a/appl/xnlock/Makefile.in +++ b/appl/xnlock/Makefile.in @@ -27,8 +27,9 @@ libdir = @libdir@ bindir = @bindir@ mandir = @mandir@ transform=@program_transform_name@ +EXECSUFFIX=@EXECSUFFIX@ -X_PROGS_BIN = xnlock +X_PROGS_BIN = xnlock$(EXECSUFFIX) PROG_BIN = @MAKE_X_PROGS_BIN@ PROG_LIBEXEC = @@ -92,7 +93,7 @@ dist: $(DISTFILES) KLIB=-L../../lib/krb -lkrb -L../../lib/des -ldes LIBROKEN=-L../../lib/roken -lroken -xnlock: xnlock.o +xnlock$(EXECSUFFIX): xnlock.o $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ xnlock.o @KRB_KAFS_LIB@ $(KLIB) $(LIBROKEN) $(LIBS) $(LIBROKEN) $(OBJECTS): ../../config.h diff --git a/lib/des/Makefile.in b/lib/des/Makefile.in index 3faafd4c7..c9d8e7a68 100644 --- a/lib/des/Makefile.in +++ b/lib/des/Makefile.in @@ -24,11 +24,16 @@ exec_prefix = @exec_prefix@ bindir = @bindir@ libdir = @libdir@ transform=@program_transform_name@ +EXECSUFFIX=@EXECSUFFIX@ PICFLAGS = @PICFLAGS@ -PROGS = destest mdtest des rpw speed -PROGS2INSTALL = des +PROGS = destest$(EXECSUFFIX) \ + mdtest$(EXECSUFFIX) \ + des$(EXECSUFFIX) \ + rpw$(EXECSUFFIX) \ + speed$(EXECSUFFIX) +PROGS2INSTALL = des$(EXECSUFFIX) LIBNAME = $(LIBPREFIX)des LIBEXT = @LIBEXT@ LIBPREFIX = @LIBPREFIX@ @@ -82,9 +87,9 @@ uninstall: TAGS: $(LIBSRC) etags $(LIBSRC) -check: destest mdtest - ./destest - ./mdtest +check: destest$(EXECSUFFIX) mdtest$(EXECSUFFIX) + ./destest$(EXECSUFFIX) + ./mdtest$(EXECSUFFIX) clean: rm -f $(LIB) *.o *.a $(PROGS) @@ -112,19 +117,19 @@ $(LIBNAME).$(SHLIBEXT): $(LIBOBJ) rm -f $@ $(CC) $(CFLAGS) $(PICFLAGS) $(SHARED) -o $@ $(LIBOBJ) -mdtest: mdtest.o +mdtest$(EXECSUFFIX): mdtest.o $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ mdtest.o -L. -ldes -destest: destest.o +destest$(EXECSUFFIX): destest.o $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ destest.o -L. -ldes -des: des.o +des$(EXECSUFFIX): des.o $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ des.o -L. -ldes -rpw: rpw.o +rpw$(EXECSUFFIX): rpw.o $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ rpw.o -L. -ldes -speed: speed.o +speed$(EXECSUFFIX): speed.o $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ speed.o -L. -ldes $(LIBOBJ): ../../config.h diff --git a/lib/otp/Makefile.in b/lib/otp/Makefile.in index 8cbbc280b..7460e5872 100644 --- a/lib/otp/Makefile.in +++ b/lib/otp/Makefile.in @@ -29,8 +29,9 @@ LIBEXT = @LIBEXT@ SHLIBEXT = @SHLIBEXT@ LIBPREFIX = @LIBPREFIX@ SHARED = @SHARED@ +EXECSUFFIX=@EXECSUFFIX@ LIB = $(LIBNAME).$(LIBEXT) -PROGS = otptest +PROGS = otptest$(EXECSUFFIX) LIB_SOURCES = otp.c otp_challenge.c otp_db.c otp_md.c \ otp_parse.c otp_print.c otp_verify.c @@ -65,8 +66,8 @@ uninstall: TAGS: $(SOURCES) etags $(SOURCES) -check: otptest - ./otptest +check: otptest$(EXECSUFFIX) + ./otptest$(EXECSUFFIX) clean: rm -f $(LIB) $(PROGS) *.o *.a @@ -79,7 +80,7 @@ distclean: clean realclean: distclean rm -f TAGS -otptest: $(OTPTEST_OBJECTS) +otptest$(EXECSUFFIX): $(OTPTEST_OBJECTS) $(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OTPTEST_OBJECTS) -L. -lotp -L../des -ldes $(LIBROKEN) $(LIBS) $(LIBROKEN) $(LIBNAME).a: $(LIB_OBJECTS)