diff options
| author | Christopher Faylor <cgf@redhat.com> | 2003-03-09 17:13:08 +0000 |
|---|---|---|
| committer | Christopher Faylor <cgf@redhat.com> | 2003-03-09 17:13:08 +0000 |
| commit | 9fa5c93e0ee003c3210bf399426141bfc1310dd5 (patch) | |
| tree | 768a781988d98e9e86d3499311deddf8305f9800 | |
| parent | 1f11ea1c09c9d7378f06d1970aeaa9345d40c977 (diff) | |
| download | gdb-9fa5c93e0ee003c3210bf399426141bfc1310dd5.tar.gz | |
Fix merge screwup
| -rw-r--r-- | winsup/cygwin/Makefile.in | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index f8507ede312..7276b819623 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -49,6 +49,7 @@ DEFS:=@DEFS@ # cygheap_CFLAGS:=-fomit-frame-pointer malloc_CFLAGS:=-fomit-frame-pointer +malloc_wrapper_CFLAGS:=-fomit-frame-pointer shared_CFLAGS:=-fomit-frame-pointer cygthread_CFLAGS:=-fomit-frame-pointer miscfuncs_CFLAGS:=-fomit-frame-pointer @@ -145,16 +146,17 @@ MALLOC_OFILES=@MALLOC_OFILES@ DLL_IMPORTS:=$(w32api_lib)/libkernel32.a +MT_SAFE_OBJECTS:= # Please maintain this list in sorted order, with maximum files per 80 col line DLL_OFILES:=assert.o autoload.o cxx.o cygheap.o cygserver_client.o \ cygserver_transport.o cygserver_transport_pipes.o \ cygserver_transport_sockets.o cygthread.o dcrt0.o debug.o \ - delqueue.o dir.o dlfcn.o dll_init.o dtable.o environ.o errno.o \ + delqueue.o devices.o dir.o dlfcn.o dll_init.o dtable.o environ.o errno.o \ exceptions.o exec.o external.o fcntl.o fhandler.o \ fhandler_clipboard.o fhandler_console.o fhandler_disk_file.o \ - fhandler_dsp.o fhandler_floppy.o fhandler_mem.o \ - fhandler_proc.o fhandler_process.o fhandler_random.o \ - fhandler_raw.o fhandler_registry.o fhandler_serial.o \ + fhandler_dsp.o fhandler_fifo.o fhandler_floppy.o fhandler_mem.o \ + fhandler_nodevice.o fhandler_proc.o fhandler_process.o \ + fhandler_random.o fhandler_raw.o fhandler_registry.o fhandler_serial.o \ fhandler_socket.o fhandler_tape.o fhandler_termios.o \ fhandler_tty.o fhandler_virtual.o fhandler_windows.o \ fhandler_zero.o fnmatch.o fork.o glob.o grp.o heap.o init.o ioctl.o \ @@ -286,7 +288,7 @@ $(TEST_DLL_NAME): $(LDSCRIPT) $(DLL_OFILES) $(DEF_FILE) $(DLL_IMPORTS) $(LIBC) $ -e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o winver.o \ $(MALLOC_OBJ) $(LIBM) $(LIBC) \ -lgcc $(DLL_IMPORTS) - @ln $@ new-$(DLL_NAME) + @ln -f $@ new-$(DLL_NAME) # Rule to build libcygwin.a $(LIB_NAME): rmsym newsym $(TEST_DLL_NAME) $(LIBCOS) @@ -353,6 +355,11 @@ cygserver_transport_sockets_outside.o: cygserver_transport_sockets.cc cygserver_client_outside.o: cygserver_client.cc $(COMPILE_CXX) -D__OUTSIDE_CYGWIN__ -o $@ $< +# gperf -c --key-positions='1-126' -r -t -C -E -L 'ANSI-C' -Hdevhash -N'device::lookup' -Z devstring -7 $? |\ + +$(srcdir)/devices.cc: cygwin-gperf devices.gperf devices.h + perl $^ > $@ + cygserver.exe: cygserver.o cygserver_shm.o cygserver_transport_outside.o cygserver_transport_pipes_outside.o cygserver_transport_sockets_outside.o cygserver_client_outside.o cygserver_process.o threaded_queue.o wincap.o version.o smallprint.o $(CXX) -o $@ $^ -lstdc++ #ifdef VERBOSE |