[Python-checkins] python/dist/src/PC/os2emx Makefile,1.14,1.15

[aimacintyre at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/PC/os2emx
In directory sc8-pr-cvs1:/tmp/cvs-serv3201

Modified Files:
	Makefile 
Log Message:

- add build support for curses extension to be a normal DLL as well as
  a Python extension, so that the curses_panel extension works.
- minor compiler switch tweak.


Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/os2emx/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile	16 Jul 2003 13:31:11 -0000	1.14
--- Makefile	2 Dec 2003 12:21:20 -0000	1.15
***************
*** 92,96 ****
    LDFLAGS+=	-g
  else
!   CFLAGS+=	-s -O3 -fomit-frame-pointer
    LDFLAGS+=	-s
  endif
--- 92,96 ----
    LDFLAGS+=	-g
  else
!   CFLAGS+=	-s -O3 -fomit-frame-pointer -mprobe
    LDFLAGS+=	-s
  endif
***************
*** 114,117 ****
--- 114,118 ----
  # File extensions
  MODULE.EXT=	.pyd
+ MODLIB.EXT=	.dll
  ifeq ($(OMF),yes)
    O=		.obj
***************
*** 254,258 ****
  DESCRIPTION.readline$(MODULE.EXT)=	Python Extension DLL for access to GNU ReadLine library
  DESCRIPTION.bsddb185$(MODULE.EXT)=	Python Extension DLL for access to BSD DB (v1.85) library
! DESCRIPTION._curses$(MODULE.EXT)=	Python Extension DLL for access to ncurses library
  DESCRIPTION.pyexpat$(MODULE.EXT)=	Python Extension DLL for access to expat library
  DESCRIPTION.bz2$(MODULE.EXT)=		Python Extension DLL for accessing the bz2 compression library
--- 255,259 ----
  DESCRIPTION.readline$(MODULE.EXT)=	Python Extension DLL for access to GNU ReadLine library
  DESCRIPTION.bsddb185$(MODULE.EXT)=	Python Extension DLL for access to BSD DB (v1.85) library
! DESCRIPTION._curses$(MODLIB.EXT)=	Python Extension DLL for access to ncurses library
  DESCRIPTION.pyexpat$(MODULE.EXT)=	Python Extension DLL for access to expat library
  DESCRIPTION.bz2$(MODULE.EXT)=		Python Extension DLL for accessing the bz2 compression library
***************
*** 430,433 ****
--- 431,438 ----
  		unicoded
  
+ # Python modules that are used as libraries and therefore must use
+ # a .DLL extension
+ LIBEXTMODULES=
+ 
  # Python external ($(MODULE.EXT)) modules - can be EASY or HARD
  ifeq ($(HAVE_ZLIB),yes)
***************
*** 452,456 ****
  endif
  ifeq ($(HAVE_NCURSES),yes)
!   HARDEXTMODULES+=	_curses _curses_
  endif
  ifeq ($(HAVE_GDBM),yes)
--- 457,462 ----
  endif
  ifeq ($(HAVE_NCURSES),yes)
!   LIBEXTMODULES+=	_curses
!   HARDEXTMODULES+=	_curses_
  endif
  ifeq ($(HAVE_GDBM),yes)
***************
*** 474,477 ****
--- 480,484 ----
  EXTERNDLLS=	$(addsuffix $(MODULE.EXT),$(patsubst %module,%,$(EASYEXTMODULES)))
  EXTERNDLLS+=	$(addsuffix $(MODULE.EXT),$(patsubst %module,%,$(HARDEXTMODULES)))
+ EXTERNDLLS+=	$(addsuffix $(MODLIB.EXT),$(patsubst %module,%,$(LIBEXTMODULES)))
  
  # Targets
***************
*** 584,588 ****
  	@echo Creating .DEF file: $@
  	@echo LIBRARY $(notdir $*) INITINSTANCE TERMINSTANCE >$@
! 	@echo DESCRIPTION $(DQUOTE)$(DESCRIPTION.$(notdir $*)$(MODULE.EXT))$(DQUOTE) >>$@
  	@echo DATA MULTIPLE NONSHARED >>$@
  	@echo EXPORTS >>$@
--- 591,595 ----
  	@echo Creating .DEF file: $@
  	@echo LIBRARY $(notdir $*) INITINSTANCE TERMINSTANCE >$@
! 	@echo DESCRIPTION $(DQUOTE)$(DESCRIPTION.$(notdir $*)$(MODLIB.EXT))$(DQUOTE) >>$@
  	@echo DATA MULTIPLE NONSHARED >>$@
  	@echo EXPORTS >>$@
***************
*** 610,614 ****
  	@echo 	init_curses_panel >>$@
  
! _curses$(MODULE.EXT): $(OUT)_cursesmodule$O $(OUT)_curses_m.def $(PYTHON.IMPLIB)
  	$(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) -lncurses
  
--- 617,621 ----
  	@echo 	init_curses_panel >>$@
  
! _curses$(MODLIB.EXT): $(OUT)_cursesmodule$O $(OUT)_curses_m.def $(PYTHON.IMPLIB)
  	$(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) -lncurses