Remove manually written nmake makefiles (cmake should be used instead)

This nmake stuff is out dated, and nobody wants to support it anyway.

diff --git a/Makefile.am b/Makefile.am
index 6001139b3c2fe4a6c6b7df4f85a8308fec1bb908..c28559560dbb1676de91d2f3313ae652c5ef42f9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -136,7 +136,6 @@ EXTRA_DIST = \
        ChangeLog-2.0 \
        Doxyfile \
        LICENSE \
-       Makefile.nmake test/Makefile.nmake \
        autogen.sh \
        event_rpcgen.py \
        libevent.pc.in \
@@ -179,7 +178,7 @@ if BUILD_WIN32
 SYS_LIBS = -lws2_32 -lshell32 -ladvapi32
 SYS_SRC = win32select.c buffer_iocp.c event_iocp.c \
        bufferevent_async.c
-SYS_INCLUDES = -IWIN32-Code -IWIN32-Code/nmake
+SYS_INCLUDES = -IWIN32-Code
 
 if THREADS
 SYS_SRC += evthread_win32.c
@@ -288,8 +287,6 @@ libevent_openssl_la_CPPFLAGS = $(AM_CPPFLAGS) $(OPENSSL_INCS)
 endif
 
 noinst_HEADERS +=                              \
-       WIN32-Code/nmake/evconfig-private.h     \
-       WIN32-Code/nmake/event2/event-config.h  \
        WIN32-Code/tree.h                       \
        bufferevent-internal.h                  \
        changelist-internal.h                   \

diff --git a/Makefile.nmake b/Makefile.nmake
deleted file mode 100644 (file)
index f27cd61..0000000
--- a/Makefile.nmake
+++ /dev/null
@@ -1,82 +0,0 @@
-# WATCH OUT!  This makefile is a work in progress.             -*- makefile -*-
-#
-# I'm not very knowledgeable about MSVC and nmake beyond their most basic
-# aspects.  If anything here looks wrong to you, please let me know.
-
-# If OPENSSL_DIR is not set, builds without OpenSSL support.  If you want
-# OpenSSL support, you can set the OPENSSL_DIR variable to where you
-# installed OpenSSL.  This can be done in the environment:
-#   set OPENSSL_DIR=c:\openssl
-# Or on the nmake command line:
-#   nmake OPENSSL_DIR=C:\openssl -f Makefile.nmake
-# Or by uncommenting the following line here in the makefile...
-
-# OPENSSL_DIR=c:\openssl
-
-!IFDEF OPENSSL_DIR
-SSL_CFLAGS=/I$(OPENSSL_DIR)\include /DEVENT__HAVE_OPENSSL
-!ELSE
-SSL_CFLAGS=
-!ENDIF
-
-# Needed for correctness
-CFLAGS=/IWIN32-Code /IWIN32-Code/nmake /Iinclude /Icompat /DHAVE_CONFIG_H /I. $(SSL_CFLAGS)
-
-# For optimization and warnings
-CFLAGS=$(CFLAGS) /Ox /W3 /wd4996 /nologo
-
-# XXXX have a debug mode
-
-LIBFLAGS=/nologo
-
-CORE_OBJS=event.obj buffer.obj bufferevent.obj bufferevent_sock.obj \
-       bufferevent_pair.obj listener.obj evmap.obj log.obj evutil.obj \
-       strlcpy.obj signal.obj bufferevent_filter.obj evthread.obj \
-       bufferevent_ratelim.obj evutil_rand.obj evutil_time.obj
-WIN_OBJS=win32select.obj evthread_win32.obj buffer_iocp.obj \
-       event_iocp.obj bufferevent_async.obj
-EXTRA_OBJS=event_tagging.obj http.obj evdns.obj evrpc.obj
-
-!IFDEF OPENSSL_DIR
-SSL_OBJS=bufferevent_openssl.obj
-SSL_LIBS=libevent_openssl.lib
-!ELSE
-SSL_OBJS=
-SSL_LIBS=
-!ENDIF
-
-ALL_OBJS=$(CORE_OBJS) $(WIN_OBJS) $(EXTRA_OBJS) $(SSL_OBJS)
-STATIC_LIBS=libevent_core.lib libevent_extras.lib libevent.lib $(SSL_LIBS)
-
-
-all: static_libs tests
-
-static_libs: $(STATIC_LIBS)
-
-libevent_core.lib: $(CORE_OBJS) $(WIN_OBJS)
-       lib $(LIBFLAGS) $(CORE_OBJS) $(WIN_OBJS) /out:libevent_core.lib 
-
-libevent_extras.lib: $(EXTRA_OBJS)
-       lib $(LIBFLAGS) $(EXTRA_OBJS) /out:libevent_extras.lib
-
-libevent.lib: $(CORE_OBJS) $(WIN_OBJS) $(EXTRA_OBJS)
-       lib $(LIBFLAGS) $(CORE_OBJS) $(EXTRA_OBJS) $(WIN_OBJS) /out:libevent.lib
-
-libevent_openssl.lib: $(SSL_OBJS)
-       lib $(LIBFLAGS) $(SSL_OBJS) /out:libevent_openssl.lib
-
-clean:
-       del $(ALL_OBJS)
-       del $(STATIC_LIBS)
-       cd test
-       $(MAKE) /F Makefile.nmake clean
-       cd ..
-
-tests:
-       cd test
-!IFDEF OPENSSL_DIR
-       $(MAKE) OPENSSL_DIR=$(OPENSSL_DIR) /F Makefile.nmake
-!ELSE
-       $(MAKE) /F Makefile.nmake
-!ENDIF
-       cd ..

diff --git a/WIN32-Code/nmake/evconfig-private.h b/WIN32-Code/nmake/evconfig-private.h
deleted file mode 100644 (file)
index 88e2062..0000000
--- a/WIN32-Code/nmake/evconfig-private.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#if !defined(EVENT_EVCONFIG__PRIVATE_H_) && !defined(__MINGW32__)
-#define EVENT_EVCONFIG__PRIVATE_H_
-
-/* Nothing to see here.  Move along. */
-
-#endif

diff --git a/WIN32-Code/nmake/event2/event-config.h b/WIN32-Code/nmake/event2/event-config.h
deleted file mode 100644 (file)
index c9e3632..0000000
--- a/WIN32-Code/nmake/event2/event-config.h
+++ /dev/null
@@ -1,350 +0,0 @@
-/* event2/event-config.h
- *
- * This file was generated by autoconf when libevent was built, and post-
- * processed by Libevent so that its macros would have a uniform prefix.
- *
- * DO NOT EDIT THIS FILE.
- *
- * Do not rely on macros in this file existing in later versions.
- */
-#ifndef EVENT_CONFIG_H__
-#define EVENT_CONFIG_H__
-/* config.h.  Generated by configure.  */
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Define if libevent should not allow replacing the mm functions */
-/* #undef EVENT__DISABLE_MM_REPLACEMENT */
-
-/* Define if libevent should not be compiled with thread support */
-/* #undef EVENT__DISABLE_THREAD_SUPPORT */
-
-/* Define if clock_gettime is available in libc */
-/* #undef _EVENT_DNS_USE_CPU_CLOCK_FOR_ID */
-
-/* Define is no secure id variant is available */
-/* #define _EVENT_DNS_USE_GETTIMEOFDAY_FOR_ID 1 */
-#define EVENT_DNS_USE_FTIME_FOR_ID_ 1
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-/* #undef EVENT__HAVE_ARPA_INET_H */
-
-/* Define to 1 if you have the `clock_gettime' function. */
-/* #undef EVENT__HAVE_CLOCK_GETTIME */
-
-/* Define if /dev/poll is available */
-/* #undef EVENT__HAVE_DEVPOLL */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef EVENT__HAVE_DLFCN_H */
-
-/* Define if your system supports the epoll system calls */
-/* #undef EVENT__HAVE_EPOLL */
-
-/* Define to 1 if you have the `epoll_ctl' function. */
-/* #undef EVENT__HAVE_EPOLL_CTL */
-
-/* Define to 1 if you have the `eventfd' function. */
-/* #undef EVENT__HAVE_EVENTFD */
-
-/* Define if your system supports event ports */
-/* #undef EVENT__HAVE_EVENT_PORTS */
-
-/* Define to 1 if you have the `fcntl' function. */
-/* #undef EVENT__HAVE_FCNTL */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define EVENT__HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `getaddrinfo' function. */
-#define EVENT__HAVE_GETADDRINFO 1
-
-/* Define to 1 if you have the `getnameinfo' function. */
-#define EVENT__HAVE_GETNAMEINFO 1
-
-/* Define to 1 if you have the `getprotobynumber' function. */
-#define EVENT__HAVE_GETPROTOBYNUMBER 1
-
-/* Define to 1 if you have the `getservbyname' function. */
-#define EVENT__HAVE_GETSERVBYNAME 1
-
-/* Define to 1 if you have the `gettimeofday' function. */
-/* #define EVENT__HAVE_GETTIMEOFDAY 1 */
-
-/* Define to 1 if you have the `inet_ntop' function. */
-/* #undef EVENT__HAVE_INET_NTOP */
-
-/* Define to 1 if you have the `inet_pton' function. */
-/* #undef EVENT__HAVE_INET_PTON */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-/* #define EVENT__HAVE_INTTYPES_H 1 */
-
-/* Define to 1 if you have the `kqueue' function. */
-/* #undef EVENT__HAVE_KQUEUE */
-
-/* Define if the system has zlib */
-/* #undef EVENT__HAVE_LIBZ */
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define EVENT__HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mmap' function. */
-/* #undef EVENT__HAVE_MMAP */
-
-/* Define to 1 if you have the <netinet/in6.h> header file. */
-/* #undef EVENT__HAVE_NETINET_IN6_H */
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-/* #undef EVENT__HAVE_NETINET_IN_H */
-
-/* Define to 1 if you have the `pipe' function. */
-/* #undef EVENT__HAVE_PIPE */
-
-/* Define to 1 if you have the `poll' function. */
-/* #undef EVENT__HAVE_POLL */
-
-/* Define to 1 if you have the <poll.h> header file. */
-/* #undef EVENT__HAVE_POLL_H */
-
-/* Define to 1 if you have the `port_create' function. */
-/* #undef EVENT__HAVE_PORT_CREATE */
-
-/* Define to 1 if you have the <port.h> header file. */
-/* #undef EVENT__HAVE_PORT_H */
-
-/* Define if you have POSIX threads libraries and header files. */
-/* #undef EVENT__HAVE_PTHREAD */
-
-/* Define if we have pthreads on this system */
-/* #undef EVENT__HAVE_PTHREADS */
-
-/* Define to 1 if the system has the type `sa_family_t'. */
-/* #undef EVENT__HAVE_SA_FAMILY_T */
-
-/* Define to 1 if you have the `select' function. */
-/* #undef EVENT__HAVE_SELECT */
-
-/* Define to 1 if you have the `sendfile' function. */
-/* #undef EVENT__HAVE_SENDFILE */
-
-/* Define if F_SETFD is defined in <fcntl.h> */
-/* #undef EVENT__HAVE_SETFD */
-
-/* Define to 1 if you have the `sigaction' function. */
-/* #undef EVENT__HAVE_SIGACTION */
-
-/* Define to 1 if you have the `signal' function. */
-#define EVENT__HAVE_SIGNAL 1
-
-/* Define to 1 if you have the `splice' function. */
-/* #undef EVENT__HAVE_SPLICE */
-
-/* Define to 1 if you have the <stdarg.h> header file. */
-#define EVENT__HAVE_STDARG_H 1
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#define EVENT__HAVE_STDDEF_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-/* #define EVENT__HAVE_STDINT_H 1 */
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define EVENT__HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define EVENT__HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define EVENT__HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strlcpy' function. */
-/* #undef EVENT__HAVE_STRLCPY */
-
-/* Define to 1 if you have the `strsep' function. */
-/* #undef EVENT__HAVE_STRSEP */
-
-/* Define to 1 if you have the `strtok_r' function. */
-/* #undef EVENT__HAVE_STRTOK_R */
-
-/* Define to 1 if you have the `strtoll' function. */
-/* #define EVENT__HAVE_STRTOLL 1 */
-
-#define EVENT__HAVE_STRUCT_ADDRINFO 1
-
-/* Define to 1 if the system has the type `struct in6_addr'. */
-#define EVENT__HAVE_STRUCT_IN6_ADDR 1
-
-/* Define to 1 if `s6_addr16' is member of `struct in6_addr'. */
-#define EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR16 1
-
-/* Define to 1 if `s6_addr32' is member of `struct in6_addr'. */
-#define EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR32 1
-
-/* Define to 1 if the system has the type `struct sockaddr_in6'. */
-#define EVENT__HAVE_STRUCT_SOCKADDR_IN6 1
-
-/* Define to 1 if `sin6_len' is member of `struct sockaddr_in6'. */
-/* #undef EVENT__HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN */
-
-/* Define to 1 if `sin_len' is member of `struct sockaddr_in'. */
-/* #undef EVENT__HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
-
-/* Define to 1 if the system has the type `struct sockaddr_storage'. */
-#define EVENT__HAVE_STRUCT_SOCKADDR_STORAGE 1
-
-/* Define to 1 if you have the <sys/epoll.h> header file. */
-/* #undef EVENT__HAVE_SYS_EPOLL_H */
-
-/* Define to 1 if you have the <sys/eventfd.h> header file. */
-/* #undef EVENT__HAVE_SYS_EVENTFD_H */
-
-/* Define to 1 if you have the <sys/event.h> header file. */
-/* #undef EVENT__HAVE_SYS_EVENT_H */
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-/* #undef EVENT__HAVE_SYS_IOCTL_H */
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-/* #undef EVENT__HAVE_SYS_MMAN_H */
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-/* #define EVENT__HAVE_SYS_PARAM_H 1 */
-
-/* Define to 1 if you have the <sys/queue.h> header file. */
-/* #undef EVENT__HAVE_SYS_QUEUE_H */
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-/* #undef EVENT__HAVE_SYS_SELECT_H */
-
-/* Define to 1 if you have the <sys/sendfile.h> header file. */
-/* #undef EVENT__HAVE_SYS_SENDFILE_H */
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-/* #undef EVENT__HAVE_SYS_SOCKET_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define EVENT__HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-/* #define EVENT__HAVE_SYS_TIME_H 1 */
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define EVENT__HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-/* #undef EVENT__HAVE_SYS_UIO_H */
-
-/* Define if TAILQ_FOREACH is defined in <sys/queue.h> */
-/* #undef EVENT__HAVE_TAILQFOREACH */
-
-/* Define if timeradd is defined in <sys/time.h> */
-/* #undef EVENT__HAVE_TIMERADD */
-
-/* Define if timerclear is defined in <sys/time.h> */
-#define EVENT__HAVE_TIMERCLEAR 1
-
-/* Define if timercmp is defined in <sys/time.h> */
-#define EVENT__HAVE_TIMERCMP 1
-
-/* Define if timerisset is defined in <sys/time.h> */
-#define EVENT__HAVE_TIMERISSET 1
-
-/* Define to 1 if the system has the type `uint16_t'. */
-/* #define EVENT__HAVE_UINT16_T 1 */
-
-/* Define to 1 if the system has the type `uint32_t'. */
-/* #define EVENT__HAVE_UINT32_T 1 */
-
-/* Define to 1 if the system has the type `uint64_t'. */
-/* #define EVENT__HAVE_UINT64_T 1 */
-
-/* Define to 1 if the system has the type `uint8_t'. */
-/* #define EVENT__HAVE_UINT8_T 1 */
-
-/* Define to 1 if you have the <unistd.h> header file. */
-/* #define EVENT__HAVE_UNISTD_H 1 */
-
-/* Define to 1 if you have the `vasprintf' function. */
-/* #undef EVENT__HAVE_VASPRINTF */
-
-/* Define if kqueue works correctly with pipes */
-/* #undef EVENT__HAVE_WORKING_KQUEUE */
-
-/* Numeric representation of the version */
-#define EVENT__NUMERIC_VERSION 0x02020001
-
-/* Name of package */
-#define EVENT__PACKAGE "libevent"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define EVENT__PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define EVENT__PACKAGE_NAME ""
-
-/* Define to the full name and version of this package. */
-#define EVENT__PACKAGE_STRING ""
-
-/* Define to the one symbol short name of this package. */
-#define EVENT__PACKAGE_TARNAME ""
-
-/* Define to the version of this package. */
-#define EVENT__PACKAGE_VERSION ""
-
-/* Define to necessary symbol if this constant uses a non-standard name on
-   your system. */
-/* #undef EVENT__PTHREAD_CREATE_JOINABLE */
-
-/* The size of a `int', as computed by sizeof. */
-#define EVENT__SIZEOF_INT 4
-
-/* The size of a `long', as computed by sizeof. */
-#define EVENT__SIZEOF_LONG 4
-
-/* The size of a `long long', as computed by sizeof. */
-#define EVENT__SIZEOF_LONG_LONG 8
-
-/* The size of a `short', as computed by sizeof. */
-#define EVENT__SIZEOF_SHORT 2
-
-/* The size of `size_t', as computed by sizeof. */
-#ifdef _WIN64
-#define EVENT__SIZEOF_SIZE_T 8
-#else
-#define EVENT__SIZEOF_SIZE_T 4
-#endif
-
-/* The size of `void *', as computed by sizeof. */
-#ifdef _WIN64
-#define EVENT__SIZEOF_VOID_P 8
-#else
-#define EVENT__SIZEOF_VOID_P 4
-#endif
-
-/* The size of `time_t`, as computed by sizeof. */
-#ifdef _WIN64
-#define EVENT__SIZEOF_TIME_T 8
-#else
-#define EVENT__SIZEOF_TIME_T 4
-#endif
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define EVENT__TIME_WITH_SYS_TIME 1
-
-/* Version number of package */
-#define EVENT__VERSION "2.2.0-alpha-dev"
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#define EVENT__inline __inline
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-/* #undef EVENT__size_t */
-
-/* Define to unsigned int if you dont have it */
-#define EVENT__socklen_t unsigned int
-
-/* Define to `int' if <sys/types.h> does not define. */
-#define EVENT__ssize_t SSIZE_T
-
-#endif

diff --git a/test/Makefile.nmake b/test/Makefile.nmake
deleted file mode 100644 (file)
index 30c3eb7..0000000
--- a/test/Makefile.nmake
+++ /dev/null
@@ -1,79 +0,0 @@
-# WATCH OUT!  This makefile is a work in progress.             -*- makefile -*-
-
-!IFDEF OPENSSL_DIR
-SSL_CFLAGS=/I$(OPENSSL_DIR)\include /DEVENT__HAVE_OPENSSL
-SSL_OBJS=regress_ssl.obj
-SSL_LIBS=..\libevent_openssl.lib $(OPENSSL_DIR)\lib\libeay32.lib $(OPENSSL_DIR)\lib\ssleay32.lib gdi32.lib User32.lib
-!ELSE
-SSL_CFLAGS=
-SSL_OBJS=
-SSL_LIBS=
-!ENDIF
-
-CFLAGS=/I.. /I../WIN32-Code /I../WIN32-Code/nmake /I../include /I../compat /DHAVE_CONFIG_H /DTINYTEST_LOCAL $(SSL_CFLAGS)
-
-CFLAGS=$(CFLAGS) /Ox /W3 /wd4996 /nologo
-
-REGRESS_OBJS=regress.obj regress_buffer.obj regress_http.obj regress_dns.obj \
-       regress_testutils.obj \
-        regress_rpc.obj regress.gen.obj \
-       regress_et.obj regress_bufferevent.obj \
-       regress_listener.obj regress_util.obj tinytest.obj \
-       regress_main.obj regress_minheap.obj regress_iocp.obj \
-       regress_thread.obj regress_finalize.obj $(SSL_OBJS)
-
-OTHER_OBJS=test-init.obj test-eof.obj test-closed.obj test-weof.obj test-time.obj \
-       bench.obj bench_cascade.obj bench_http.obj bench_httpclient.obj \
-       test-changelist.obj \
-       print-winsock-errors.obj
-
-PROGRAMS=regress.exe \
-       test-init.exe test-eof.exe test-closed.exe test-weof.exe test-time.exe \
-       test-changelist.exe \
-       print-winsock-errors.exe
-
-# Disabled for now:
-#      bench.exe bench_cascade.exe bench_http.exe bench_httpclient.exe
-
-
-LIBS=..\libevent.lib ws2_32.lib shell32.lib advapi32.lib
-
-all: $(PROGRAMS)
-
-regress.exe: $(REGRESS_OBJS)
-       $(CC) $(CFLAGS) $(LIBS) $(SSL_LIBS) $(REGRESS_OBJS)
-
-test-init.exe: test-init.obj
-       $(CC) $(CFLAGS) $(LIBS) test-init.obj
-test-eof.exe: test-eof.obj
-       $(CC) $(CFLAGS) $(LIBS) test-eof.obj
-test-closed.exe: test-closed.obj
-       $(CC) $(CFLAGS) $(LIBS) test-closed.obj
-test-changelist.exe: test-changelist.obj
-       $(CC) $(CFLAGS) $(LIBS) test-changelist.obj
-test-weof.exe: test-weof.obj
-       $(CC) $(CFLAGS) $(LIBS) test-weof.obj
-test-time.exe: test-time.obj
-       $(CC) $(CFLAGS) $(LIBS) test-time.obj
-
-print-winsock-errors.exe: print-winsock-errors.obj
-       $(CC) $(CFLAGS) $(LIBS) print-winsock-errors.obj
-
-bench.exe: bench.obj
-       $(CC) $(CFLAGS) $(LIBS) bench.obj
-bench_cascade.exe: bench_cascade.obj
-       $(CC) $(CFLAGS) $(LIBS) bench_cascade.obj
-bench_http.exe: bench_http.obj
-       $(CC) $(CFLAGS) $(LIBS) bench_http.obj
-bench_httpclient.exe: bench_httpclient.obj
-       $(CC) $(CFLAGS) $(LIBS) bench_httpclient.obj
-
-regress.gen.c regress.gen.h: regress.rpc ../event_rpcgen.py
-       echo // > regress.gen.c
-       echo #define NO_PYTHON_EXISTS > regress.gen.h
-       -python ..\event_rpcgen.py regress.rpc
-
-clean:
-       -del $(REGRESS_OBJS)
-       -del $(OTHER_OBJS)
-       -del $(PROGRAMS)