From 988eb7bec52b8bfd3187f02058abeb58ecbb51c2 Mon Sep 17 00:00:00 2001 From: William McBrine Date: Sun, 13 Jul 2008 08:09:04 +0000 Subject: [PATCH] No more boxes/lines in the Makefiles. --- Makefile.in | 3 --- dos/bccdos.mak | 9 --------- dos/gccdos.mak | 11 ----------- dos/mscdos.mak | 17 ++--------------- dos/wccdos16.mak | 4 ---- dos/wccdos4g.mak | 4 ---- os2/bccos2.mak | 9 --------- os2/gccos2.mak | 11 ----------- os2/iccos2.mak | 11 ----------- os2/wccos2.mak | 4 ---- sdl1/Makefile | 5 ----- sdl1/Makefile.mng | 5 ----- win32/bccwin32.mak | 9 --------- win32/dmcwin32.mak | 12 ------------ win32/gccwin32.mak | 11 ----------- win32/lccwin32.mak | 12 ------------ win32/mingwin32.mak | 11 ----------- win32/vcwin32.mak | 12 ------------ win32/wccwin32.mak | 4 ---- x11/Makefile.aix.in | 7 ------- x11/Makefile.in | 13 +------------ 21 files changed, 3 insertions(+), 181 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4cd6455f..9335866e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -110,6 +110,3 @@ dist: ../$(TARBALL) rpm: ../$(TARBALL) rpmbuild -ba $(srcdir)/PDCurses.spec -# -# End of makefile -# diff --git a/dos/bccdos.mak b/dos/bccdos.mak index ca0aeadd..2f05c2cb 100644 --- a/dos/bccdos.mak +++ b/dos/bccdos.mak @@ -1,13 +1,9 @@ -######################################################################### -# # Borland MAKE Makefile for PDCurses library - DOS BC++ 3.0+ # # Usage: make -f [path\]bccdos.mak [-DDEBUG] [target] # # where target can be any of: # [all|demos|pdcurses.lib|testcurs.exe...] -# -######################################################################### # Change the memory MODEL here, if desired MODEL = l @@ -38,7 +34,6 @@ LIBEXE = tlib /C /E LIBCURSES = pdcurses.lib -######################################################################### all: $(LIBCURSES) $(DEMOS) clean: @@ -49,8 +44,6 @@ clean: demos: $(DEMOS) -#------------------------------------------------------------------------ - $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) -del $@ $(LIBEXE) $@ @$(osdir)\bccdos.lrf @@ -73,8 +66,6 @@ $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) .obj.exe: $(CC) -m$(MODEL) -e$@ $** $(LIBCURSES) -#------------------------------------------------------------------------ - tuidemo.exe: tuidemo.obj tui.obj $(LIBCURSES) $(CC) -m$(MODEL) -e$@ $** diff --git a/dos/gccdos.mak b/dos/gccdos.mak index 1ea16a8b..1342d8d4 100644 --- a/dos/gccdos.mak +++ b/dos/gccdos.mak @@ -1,13 +1,9 @@ -######################################################################### -# # GNU MAKE (3.79.1) Makefile for PDCurses library - DOS DJGPP V2.0+ # # Usage: make -f [path\]gccdos.mak [-DDEBUG] [target] # # where target can be any of: # [all|libs|demos|dist|pdcurses.a|testcurs.exe...] -# -######################################################################### O = o @@ -41,7 +37,6 @@ LIBFLAGS = rcv LIBCURSES = pdcurses.a -######################################################################### .PHONY: all libs clean demos dist all: libs demos @@ -56,8 +51,6 @@ clean: demos: $(DEMOS) strip *.exe -#------------------------------------------------------------------------ - $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) $(LIBEXE) $(LIBFLAGS) $@ $? -copy $(LIBCURSES) panel.a @@ -74,8 +67,6 @@ $(LIBOBJS) : %.o: $(srcdir)/%.c $(PDCOBJS) : %.o: $(osdir)/%.c $(CC) -c $(CFLAGS) $< -#------------------------------------------------------------------------ - firework.exe newdemo.exe rain.exe testcurs.exe worm.exe xmas.exe \ ptest.exe: %.exe: $(demodir)/%.c $(CC) $(CFLAGS) -o$@ $< $(LIBCURSES) @@ -89,8 +80,6 @@ tui.o: $(demodir)/tui.c $(demodir)/tui.h $(PDCURSES_CURSES_H) tuidemo.o: $(demodir)/tuidemo.c $(PDCURSES_CURSES_H) $(CC) -c $(CFLAGS) -I$(demodir) -o$@ $< -#------------------------------------------------------------------------ - PLATFORM1 = DJGPP 2.03 PLATFORM2 = DJGPP 2.03 for DOS ARCNAME = pdc$(VER)djg diff --git a/dos/mscdos.mak b/dos/mscdos.mak index d675417c..987f0cbd 100644 --- a/dos/mscdos.mak +++ b/dos/mscdos.mak @@ -1,17 +1,13 @@ -######################################################################### -# # NMAKE Makefile for PDCurses library - Microsoft C for DOS # # Usage: nmake -f [path\]dosmsc.mak [DEBUG=1] [target] # # where target can be any of: # [all|demos|pdcurses.lib|testcurs.exe...] -# -######################################################################### # Change the memory MODEL here, if desired -MODEL = L # one of L, S, M, T, H, C -SIZE = LARGE # one of LARGE, SMALL, MEDIUM, TINY, HUGE, COMPACT +MODEL = L # one of L, S, M, T, H, C +SIZE = LARGE # one of LARGE, SMALL, MEDIUM, TINY, HUGE, COMPACT O = obj @@ -48,7 +44,6 @@ LIBEXE = lib LIBCURSES = pdcurses.lib -######################################################################### all: $(LIBCURSES) $(DEMOS) clean: @@ -58,8 +53,6 @@ clean: demos: $(DEMOS) -#------------------------------------------------------------------------ - DEMOOBJS = $(DEMOS:.exe=.obj) tui.obj $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS) @@ -81,8 +74,6 @@ $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) {$(demodir)\}.c{}.obj: $(BUILD) $< -#------------------------------------------------------------------------ - firework.exe: firework.obj $(LINK) $(LDFLAGS) $*.obj,$*,,$(LIBCURSES); @@ -107,8 +98,6 @@ worm.exe: worm.obj xmas.exe: xmas.obj $(LINK) $(LDFLAGS) $*.obj,$*,,$(LIBCURSES); -#------------------------------------------------------------------------ - ptest.obj: $(demodir)\ptest.c $(PANEL_HEADER) $(BUILD) $(demodir)\ptest.c @@ -118,8 +107,6 @@ tui.obj: $(demodir)\tui.c $(demodir)\tui.h tuidemo.obj: $(demodir)\tuidemo.c $(BUILD) -I$(demodir) $(demodir)\tuidemo.c -#------------------------------------------------------------------------ - PLATFORM1 = Microsoft C PLATFORM2 = Microsoft C for DOS ARCNAME = pdc$(VER)msc diff --git a/dos/wccdos16.mak b/dos/wccdos16.mak index abb4eed2..a0cbb223 100644 --- a/dos/wccdos16.mak +++ b/dos/wccdos16.mak @@ -1,13 +1,9 @@ -######################################################################### -# # Watcom WMAKE Makefile for PDCurses library - DOS (16 bit) Watcom C/C++ 10.6+ # # Usage: wmake -f [path\]wccdos16.mak [DEBUG=Y] [target] # # where target can be any of: # [all|demos|pdcurses.lib|testcurs.exe...] -# -######################################################################### # Change the memory MODEL here, if desired MODEL = l diff --git a/dos/wccdos4g.mak b/dos/wccdos4g.mak index 37cd7b5d..e1ba1cde 100644 --- a/dos/wccdos4g.mak +++ b/dos/wccdos4g.mak @@ -1,13 +1,9 @@ -######################################################################### -# # Watcom WMAKE Makefile for PDCurses library - DOS/4GW Watcom C/C++ 10.6+ # # Usage: wmake -f [path\]wccdos4g.mak [DEBUG=Y] [target] # # where target can be any of: # [all|demos|pdcurses.lib|testcurs.exe...] -# -######################################################################### !ifdef %PDCURSES_SRCDIR PDCURSES_SRCDIR = $(%PDCURSES_SRCDIR) diff --git a/os2/bccos2.mak b/os2/bccos2.mak index e15dc9b8..fb4d54bb 100644 --- a/os2/bccos2.mak +++ b/os2/bccos2.mak @@ -1,13 +1,9 @@ -######################################################################### -# # Borland MAKE Makefile for PDCurses library - OS/2 BC++ 1.0+ # # Usage: make -f [path\]bccos2.mak [-DDEBUG] [target] # # where target can be any of: # [all|demos|pdcurses.lib|testcurs.exe...] -# -######################################################################### O = obj @@ -38,7 +34,6 @@ LIBEXE = tlib /C /E LIBCURSES = pdcurses.lib -######################################################################### all: $(LIBCURSES) $(DEMOS) clean: @@ -48,8 +43,6 @@ clean: demos: $(DEMOS) -#------------------------------------------------------------------------ - $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) -del $@ $(LIBEXE) $@ \ @@ -81,8 +74,6 @@ $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) .obj.exe: $(CC) -e$@ $** $(LIBCURSES) -#------------------------------------------------------------------------ - tuidemo.exe: tuidemo.obj tui.obj $(LIBCURSES) $(CC) -e$@ $** diff --git a/os2/gccos2.mak b/os2/gccos2.mak index 11cba1e8..8a5ba654 100644 --- a/os2/gccos2.mak +++ b/os2/gccos2.mak @@ -1,5 +1,3 @@ -######################################################################### -# # GNU MAKE Makefile for PDCurses library - OS/2 emx 0.9c+ # # Usage: make -f [path\]gccos2.mak [DEBUG=Y] [EMXVIDEO=Y] [target] @@ -9,8 +7,6 @@ # # The EMXVIDEO option compiles with the emx video library, which # enables a PDCurses program to run under OS/2 and DOS. -# -######################################################################### O = o @@ -72,7 +68,6 @@ else CLEAN = *.a testcurs newdemo xmas tuidemo firework ptest rain worm endif -######################################################################### .PHONY: all libs clean demos dist all: libs demos @@ -86,13 +81,9 @@ clean: demos: $(DEMOS) -#------------------------------------------------------------------------ - DEMOOBJS = testcurs.o newdemo.o xmas.o tui.o tuidemo.o firework.o \ ptest.o rain.o worm.o -#------------------------------------------------------------------------ - $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) $(LIBEXE) $(LIBFLAGS) $@ $? -copy $(LIBCURSES) panel.a @@ -114,8 +105,6 @@ $(LIBOBJS) : %.o: $(srcdir)/%.c $(PDCOBJS) : %.o: $(osdir)/%.c $(CC) -c $(CFLAGS) -o$@ $< -#------------------------------------------------------------------------ - firework.exe newdemo.exe rain.exe testcurs.exe worm.exe xmas.exe \ ptest.exe: %.exe: %.o $(LINK) $(LDFLAGS) -o $* $< $(LIBCURSES) $(CCLIBS) diff --git a/os2/iccos2.mak b/os2/iccos2.mak index a650a2ed..b2951a0c 100644 --- a/os2/iccos2.mak +++ b/os2/iccos2.mak @@ -1,13 +1,9 @@ -######################################################################### -# # NMAKE Makefile for PDCurses library - OS/2 C Set/2 # # Usage: nmake -f [path\]iccos2.mak [DEBUG=1] [target] # # where target can be any of: # [all|demos|pdcurses.lib|testcurs.exe...] -# -######################################################################### O = obj @@ -42,7 +38,6 @@ LIBEXE = lib LIBCURSES = pdcurses.lib -######################################################################### all: $(LIBCURSES) $(DEMOS) clean: @@ -52,8 +47,6 @@ clean: demos: $(DEMOS) -#------------------------------------------------------------------------ - $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) $(LIBEXE) $@ @$(osdir)\iccos2.lrf -copy $(LIBCURSES) panel.lib @@ -184,7 +177,6 @@ window.obj: $(srcdir)\window.c $(PDCURSES_HEADERS) debug.obj: $(srcdir)\debug.c $(PDCURSES_HEADERS) $(BUILD) $(srcdir)\debug.c - pdcclip.obj: $(osdir)\pdcclip.c $(PDCURSES_HEADERS) $(PDCURSES_OS2_H) $(BUILD) $(osdir)\pdcclip.c @@ -206,8 +198,6 @@ pdcsetsc.obj: $(osdir)\pdcsetsc.c $(PDCURSES_HEADERS) $(PDCURSES_OS2_H) pdcutil.obj: $(osdir)\pdcutil.c $(PDCURSES_HEADERS) $(PDCURSES_OS2_H) $(BUILD) $(osdir)\pdcutil.c -#------------------------------------------------------------------------ - firework.exe: firework.obj $(LIBCURSES) $(LINK) $(LDFLAGS) $*.obj,$*,,$(LIBCURSES); @@ -232,7 +222,6 @@ worm.exe: worm.obj $(LIBCURSES) xmas.exe: xmas.obj $(LIBCURSES) $(LINK) $(LDFLAGS) $*.obj,$*,,$(LIBCURSES); - firework.obj: $(demodir)\firework.c $(PDCURSES_CURSES_H) $(BUILD) $(demodir)\firework.c diff --git a/os2/wccos2.mak b/os2/wccos2.mak index 3097df43..d5900d30 100644 --- a/os2/wccos2.mak +++ b/os2/wccos2.mak @@ -1,13 +1,9 @@ -######################################################################### -# # Watcom WMAKE Makefile for PDCurses library - OS/2 Open Watcom 1.1+ # # Usage: wmake -f [path\]wccos2.mak [DEBUG=Y] [target] # # where target can be any of: # [all|demos|pdcurses.lib|testcurs.exe...] -# -######################################################################### !ifdef %PDCURSES_SRCDIR PDCURSES_SRCDIR = $(%PDCURSES_SRCDIR) diff --git a/sdl1/Makefile b/sdl1/Makefile index 355130f5..b0551571 100644 --- a/sdl1/Makefile +++ b/sdl1/Makefile @@ -32,7 +32,6 @@ LIBCURSES = libpdcurses.a DEMOS = firework newdemo ptest rain testcurs tuidemo worm xmas \ sdltest -######################################################################### .PHONY: all libs clean demos all: libs demos @@ -45,8 +44,6 @@ clean: demos: $(DEMOS) strip $(DEMOS) -#------------------------------------------------------------------------ - $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) ar rv $@ $? -$(RANLIB) $@ @@ -64,8 +61,6 @@ $(LIBOBJS) : %.o: $(srcdir)/%.c $(PDCOBJS) : %.o: $(osdir)/%.c $(BUILD) $(SFLAGS) -c $< -#------------------------------------------------------------------------ - firework: $(demodir)/firework.c $(BUILD) $(DEMOFLAGS) -o $@ $< $(LDFLAGS) diff --git a/sdl1/Makefile.mng b/sdl1/Makefile.mng index 38627df4..9e2f9d3a 100644 --- a/sdl1/Makefile.mng +++ b/sdl1/Makefile.mng @@ -39,7 +39,6 @@ endif DEMOS += sdltest.exe -######################################################################### .PHONY: all libs clean demos all: libs demos @@ -65,8 +64,6 @@ pdcurses.def: $(PDCURSES_SRCDIR)\win32\pdcurses.def echo pdc_yoffset >> $@ echo pdc_xoffset >> $@ -#------------------------------------------------------------------------ - $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) $(LIBEXE) $(LIBFLAGS) $@ $? $(POST) @@ -83,8 +80,6 @@ $(LIBOBJS) : %.o: $(srcdir)/%.c $(PDCOBJS) : %.o: $(osdir)/%.c $(BUILD) -c $< -#------------------------------------------------------------------------ - firework.exe newdemo.exe rain.exe testcurs.exe worm.exe xmas.exe \ ptest.exe: %.exe: $(demodir)/%.c $(BUILD) -o $@ $< $(LDFLAGS) diff --git a/win32/bccwin32.mak b/win32/bccwin32.mak index 10e00f95..229ab4be 100644 --- a/win32/bccwin32.mak +++ b/win32/bccwin32.mak @@ -1,13 +1,9 @@ -######################################################################### -# # Borland MAKE Makefile for PDCurses library - Win32 BC++ 4.0+ # # Usage: make -f [path\]bccwin32.mak [DEBUG=] [WIDE=] [UTF8=] [target] # # where target can be any of: # [all|demos|pdcurses.lib|testcurs.exe...] -# -######################################################################### O = obj @@ -43,7 +39,6 @@ LIBEXE = tlib /C /E /0 /a LIBCURSES = pdcurses.lib -######################################################################### all: $(LIBCURSES) $(DEMOS) clean: @@ -52,8 +47,6 @@ clean: -del *.tds -del *.exe -#------------------------------------------------------------------------ - $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) -del $@ $(LIBEXE) $@ $(LIBOBJS) $(PDCOBJS) @@ -76,8 +69,6 @@ $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) .obj.exe: $(CC) -e$@ $** $(LIBCURSES) -#------------------------------------------------------------------------ - tuidemo.exe: tuidemo.obj tui.obj $(LIBCURSES) $(CC) -e$@ $** diff --git a/win32/dmcwin32.mak b/win32/dmcwin32.mak index b343b602..23522cc9 100644 --- a/win32/dmcwin32.mak +++ b/win32/dmcwin32.mak @@ -1,13 +1,9 @@ -######################################################################### -# # Makefile for PDCurses library - WIN32 Digital Mars # # Usage: make -f dmcwin32.mak [target] # # where target can be any of: # [all|demos|pdcurses.lib|testcurs.exe...] -# -######################################################################### PDCURSES_SRCDIR = .. @@ -40,8 +36,6 @@ BUILD = $(CC) $(CFLAGS) $(CPPFLAGS) DEMOS = testcurs.exe newdemo.exe xmas.exe tuidemo.exe \ firework.exe ptest.exe rain.exe worm.exe -######################################################################### - all: $(LIBCURSES) $(DEMOS) clean: @@ -51,8 +45,6 @@ clean: -del *.map -del advapi32.def -#------------------------------------------------------------------------ - LIBOBJS = addch.obj addchstr.obj addstr.obj attr.obj beep.obj bkgd.obj \ border.obj clear.obj color.obj delch.obj deleteln.obj deprec.obj getch.obj \ getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj \ @@ -209,7 +201,6 @@ window.obj: $(srcdir)\window.c debug.obj: $(srcdir)\debug.c $(SRCBUILD) - pdcclip.obj: $(osdir)\pdcclip.c $(OSBUILD) @@ -231,8 +222,6 @@ pdcsetsc.obj: $(osdir)\pdcsetsc.c pdcutil.obj: $(osdir)\pdcutil.c $(OSBUILD) -#------------------------------------------------------------------------ - firework.exe: $(demodir)\firework.c $(DEMOBUILD) @@ -257,7 +246,6 @@ worm.exe: $(demodir)\worm.c xmas.exe: $(demodir)\xmas.c $(DEMOBUILD) - tui.obj: $(demodir)\tui.c $(demodir)\tui.h $(BUILD) -I$(demodir) $(demodir)\$*.c diff --git a/win32/gccwin32.mak b/win32/gccwin32.mak index f49cb799..a5b0b57f 100644 --- a/win32/gccwin32.mak +++ b/win32/gccwin32.mak @@ -1,13 +1,9 @@ -######################################################################### -# # GNU MAKE Makefile for PDCurses library - WIN32 Cygnus GCC # # Usage: make -f [path\]gccwin32.mak [DEBUG=Y] [DLL=Y] [WIDE=Y] [UTF8=Y] [tgt] # # where tgt can be any of: # [all|demos|pdcurses.a|testcurs.exe...] -# -######################################################################### O = o @@ -58,7 +54,6 @@ else CLEAN = *.a endif -######################################################################### .PHONY: all libs clean demos dist all: libs demos @@ -73,8 +68,6 @@ clean: demos: $(DEMOS) strip *.exe -#------------------------------------------------------------------------ - $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) $(LIBEXE) $(LIBFLAGS) $@ $? -cp pdcurses.a panel.a @@ -91,8 +84,6 @@ $(LIBOBJS) : %.o: $(srcdir)/%.c $(PDCOBJS) : %.o: $(osdir)/%.c $(CC) -c $(CFLAGS) $< -#------------------------------------------------------------------------ - firework.exe newdemo.exe rain.exe testcurs.exe worm.exe xmas.exe \ ptest.exe: %.exe: $(demodir)/%.c $(CC) $(CFLAGS) -o$@ $< $(LIBCURSES) @@ -106,8 +97,6 @@ tui.o: $(demodir)/tui.c $(demodir)/tui.h $(PDCURSES_CURSES_H) tuidemo.o: $(demodir)/tuidemo.c $(PDCURSES_CURSES_H) $(CC) -c $(CFLAGS) -I$(demodir) -o$@ $< -#------------------------------------------------------------------------ - dist: $(PDCLIBS) echo PDCurses $(VERDOT) for Cygnus Win32 > file_id.diz echo ------------------------------------------ >> file_id.diz diff --git a/win32/lccwin32.mak b/win32/lccwin32.mak index 81648023..4adc9d7b 100644 --- a/win32/lccwin32.mak +++ b/win32/lccwin32.mak @@ -1,13 +1,9 @@ -######################################################################### -# # Makefile for PDCurses library - WIN32 LCC-Win32 # # Usage: make -f lccwin32.mak [target] # # where target can be any of: # [all|demos|pdcurses.lib|testcurs.exe...] -# -######################################################################### PDCURSES_SRCDIR = .. @@ -55,8 +51,6 @@ PDCLIBS = $(LIBCURSES) DEMOS = testcurs.exe newdemo.exe xmas.exe tuidemo.exe \ firework.exe ptest.exe rain.exe worm.exe -######################################################################### - all: $(PDCLIBS) $(DEMOS) clean: @@ -66,8 +60,6 @@ clean: -del *.exp -del *.exe -#------------------------------------------------------------------------ - LIBOBJS = addch.obj addchstr.obj addstr.obj attr.obj beep.obj bkgd.obj \ border.obj clear.obj color.obj delch.obj deleteln.obj deprec.obj getch.obj \ getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj \ @@ -228,7 +220,6 @@ window.obj: $(srcdir)\window.c debug.obj: $(srcdir)\debug.c $(SRCBUILD) - pdcclip.obj: $(osdir)\pdcclip.c $(OSBUILD) @@ -250,8 +241,6 @@ pdcsetsc.obj: $(osdir)\pdcsetsc.c pdcutil.obj: $(osdir)\pdcutil.c $(OSBUILD) -#------------------------------------------------------------------------ - firework.exe: firework.obj $(LINK) -o $@ firework.obj $(LIBCURSES) @@ -276,7 +265,6 @@ worm.exe: worm.obj xmas.exe: xmas.obj $(LINK) -o $@ xmas.obj $(LIBCURSES) - firework.obj: $(demodir)\firework.c $(BUILD) $(demodir)\$*.c diff --git a/win32/mingwin32.mak b/win32/mingwin32.mak index 40ec8a0d..9f25b7c2 100644 --- a/win32/mingwin32.mak +++ b/win32/mingwin32.mak @@ -1,13 +1,9 @@ -######################################################################### -# # GNU MAKE Makefile for PDCurses library - WIN32 MinGW GCC # # Usage: make -f [path\]mingwin32.mak [DEBUG=Y] [DLL=Y] [WIDE=Y] [UTF8=Y] [tgt] # # where tgt can be any of: # [all|demos|pdcurses.a|testcurs.exe...] -# -######################################################################### O = o @@ -58,7 +54,6 @@ else CLEAN = *.a endif -######################################################################### .PHONY: all libs clean demos dist all: libs demos @@ -73,8 +68,6 @@ clean: demos: $(DEMOS) strip *.exe -#------------------------------------------------------------------------ - $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) $(LIBEXE) $(LIBFLAGS) $@ $? -copy pdcurses.a panel.a @@ -91,8 +84,6 @@ $(LIBOBJS) : %.o: $(srcdir)/%.c $(PDCOBJS) : %.o: $(osdir)/%.c $(CC) -c $(CFLAGS) $< -#------------------------------------------------------------------------ - firework.exe newdemo.exe rain.exe testcurs.exe worm.exe xmas.exe \ ptest.exe: %.exe: $(demodir)/%.c $(CC) $(CFLAGS) -o$@ $< $(LIBCURSES) @@ -106,8 +97,6 @@ tui.o: $(demodir)/tui.c $(demodir)/tui.h $(PDCURSES_CURSES_H) tuidemo.o: $(demodir)/tuidemo.c $(PDCURSES_CURSES_H) $(CC) -c $(CFLAGS) -I$(demodir) -o$@ $< -#------------------------------------------------------------------------ - PLATFORM1 = MinGW Win32 PLATFORM2 = MinGW for Win32 ARCNAME = pdc$(VER)_ming_w32 diff --git a/win32/vcwin32.mak b/win32/vcwin32.mak index fcaf9c46..c805b56d 100644 --- a/win32/vcwin32.mak +++ b/win32/vcwin32.mak @@ -1,13 +1,9 @@ -######################################################################### -# # Visual C++ NMakefile for PDCurses library - Win32 VC++ 2.0+ # # Usage: nmake -f [path\]vcwin32.mak [DEBUG=] [DLL=] [WIDE=] [UTF8=] [target] # # where target can be any of: # [all|demos|pdcurses.lib|testcurs.exe...] -# -######################################################################### O = obj @@ -66,8 +62,6 @@ PDCLIBS = $(LIBCURSES) BUILD = $(CC) -I$(PDCURSES_SRCDIR) -c $(CFLAGS) $(DLLOPT) \ $(WIDEOPT) $(UTF8OPT) -######################################################################### - all: $(PDCLIBS) $(DEMOS) clean: @@ -78,8 +72,6 @@ clean: -del *.exp -del *.res -#------------------------------------------------------------------------ - DEMOOBJS = $(DEMOS:.exe=.obj) tui.obj $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS) @@ -115,8 +107,6 @@ pdcurses.res pdcurses.obj: $(osdir)\pdcurses.rc $(osdir)\pdcurses.ico .obj.exe: $(LINK) $(LDFLAGS) $< $(LIBCURSES) $(CCLIBS) -#------------------------------------------------------------------------ - tuidemo.exe: tuidemo.obj tui.obj $(LINK) $(LDFLAGS) $*.obj tui.obj $(LIBCURSES) $(CCLIBS) @@ -126,8 +116,6 @@ tui.obj: $(demodir)\tui.c $(demodir)\tui.h tuidemo.obj: $(demodir)\tuidemo.c $(BUILD) -I$(demodir) $(demodir)\tuidemo.c -#------------------------------------------------------------------------ - PLATFORM1 = Visual C++ PLATFORM2 = Microsoft Visual C/C++ for Win32 ARCNAME = pdc$(VER)_vc_w32 diff --git a/win32/wccwin32.mak b/win32/wccwin32.mak index 030db2c4..1363897b 100644 --- a/win32/wccwin32.mak +++ b/win32/wccwin32.mak @@ -1,13 +1,9 @@ -######################################################################### -# # Watcom WMAKE Makefile for PDCurses library - Win32 Watcom C/C++ 10.6+ # # Usage: wmake -f [win32\]wccwin32.mak [DEBUG=Y] [WIDE=Y] [UTF8=Y] [target] # # where target can be any of: # [all|demos|pdcurses.lib|testcurs.exe...] -# -######################################################################### !ifdef %PDCURSES_SRCDIR PDCURSES_SRCDIR = $(%PDCURSES_SRCDIR) diff --git a/x11/Makefile.aix.in b/x11/Makefile.aix.in index c0c9d54c..f12f67d2 100644 --- a/x11/Makefile.aix.in +++ b/x11/Makefile.aix.in @@ -30,7 +30,6 @@ LDFLAGS = LIBCURSES = libXCurses.a -######################################################################### all : $(LIBCURSES) install : @@ -46,8 +45,6 @@ mostlyclean: clean realclean: distclean -#------------------------------------------------------------------------ - LIBOBJS = addch.o addchstr.o addstr.o attr.o beep.o bkgd.o border.o \ clear.o color.o delch.o deleteln.o deprec.o getch.o getstr.o getyx.o \ inch.o inchstr.o initscr.o inopts.o insch.o insstr.o instr.o kernel.o \ @@ -58,7 +55,6 @@ touch.o util.o window.o debug.o PDCOBJS = pdcclip.o pdcdisp.o pdcgetsc.o pdckbd.o pdcscrn.o pdcsetsc.o \ pdcutil.o pdcx11.o x11.o sb.o ScrollBox.o - $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) curses.exp ld -bnoentry -bM:SRE -bE:curses.exp $(MH_LIBS) $(MH_EXTRA_LIBS) \ $(LIBOBJS) $(PDCOBJS) -o $@ @@ -67,7 +63,6 @@ $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS) $(PDCOBJS) : $(PDCURSES_X11_H) terminfo.o: $(TERM_HEADER) - curses.exp: ../win32/pdcurses.def tail -n +3 ../win32/pdcurses.def > curses.exp echo Xinitscr >> curses.exp @@ -79,7 +74,6 @@ curses.exp: ../win32/pdcurses.def echo sb_get_vert >> curses.exp echo sb_refresh >> curses.exp - addch.o: $(srcdir)/addch.c $(BUILD) $(srcdir)/addch.c @@ -206,7 +200,6 @@ window.o: $(srcdir)/window.c debug.o: $(srcdir)/debug.c $(BUILD) $(srcdir)/debug.c - pdcclip.o: $(osdir)/pdcclip.c $(BUILD) $(osdir)/pdcclip.c diff --git a/x11/Makefile.in b/x11/Makefile.in index 497e4378..d23a214f 100644 --- a/x11/Makefile.in +++ b/x11/Makefile.in @@ -48,7 +48,6 @@ tuidemo.o worm.o xmas.o SHLFILE = XCurses -######################################################################### all: $(PDCLIBS) $(DEMOS) install: @@ -66,8 +65,6 @@ mostlyclean: clean realclean: distclean -#------------------------------------------------------------------------ - LIBOBJS = addch.o addchstr.o addstr.o attr.o beep.o bkgd.o border.o \ clear.o color.o delch.o deleteln.o deprec.o getch.o getstr.o getyx.o \ inch.o inchstr.o initscr.o inopts.o insch.o insstr.o instr.o kernel.o \ @@ -222,7 +219,6 @@ window.o: $(srcdir)/window.c debug.o: $(srcdir)/debug.c $(BUILD) $(srcdir)/debug.c - pdcclip.o: $(osdir)/pdcclip.c $(BUILD) $(osdir)/pdcclip.c @@ -256,8 +252,6 @@ sb.o: $(osdir)/sb.c x11.o: $(osdir)/x11.c $(BUILD) $(osdir)/x11.c -#------------------------------------------------------------------------ - addch.sho: $(srcdir)/addch.c $(DYN_BUILD) $(srcdir)/addch.c @SAVE2O@ @@ -426,7 +420,6 @@ debug.sho: $(srcdir)/debug.c $(DYN_BUILD) $(srcdir)/debug.c @SAVE2O@ - pdcclip.sho: $(osdir)/pdcclip.c $(DYN_BUILD) $(osdir)/pdcclip.c @SAVE2O@ @@ -471,8 +464,6 @@ x11.sho: $(osdir)/x11.c $(DYN_BUILD) $(osdir)/x11.c @SAVE2O@ -#------------------------------------------------------------------------ - firework: firework.o $(LINK) firework.o -o $@ $(LDFLAGS) @@ -497,7 +488,6 @@ worm: worm.o xmas: xmas.o $(LINK) xmas.o -o $@ $(LDFLAGS) - firework.o: $(demodir)/firework.c $(BUILD) $(demodir)/firework.c @@ -525,10 +515,9 @@ worm.o: $(demodir)/worm.c xmas.o: $(demodir)/xmas.c $(BUILD) $(demodir)/xmas.c -# # This section provides for compiling and linking the # ncurses test programs. -# + ncurses_testdir = $(HOME)/ncurses-5.6/test NCURSES_TESTS = bs gdc hanoi knight tclock ncurses