More makefile simplification -- moved common LIBOBJS etc. declarations

to libobjs file.
This commit is contained in:
William McBrine
2006-08-03 16:26:38 +00:00
parent 2b0aa7ded1
commit 81e58882f2
14 changed files with 62 additions and 164 deletions

View File

@@ -70,7 +70,7 @@ manual:
cd tools; $(MAKE) $(MFLAGS) $@
$(ZIPFILE):
zip -9y $(ZIPFILE) README HISTORY INSTALL TODO *.spec version \
zip -9y $(ZIPFILE) README HISTORY INSTALL TODO *.spec version libobjs \
Makefile.in config.h.in configure x11/xcurses-config.in configure.ac \
config.guess config.sub install-sh aclocal.m4 curses.h \
curspriv.h panel.h term.h maintain.er pdcurses/README \
@@ -87,10 +87,10 @@ zip: $(ZIPFILE)
../$(TARBALL):
(cd ..; tar cvf - $(PDC_DIR)/README $(PDC_DIR)/HISTORY \
$(PDC_DIR)/INSTALL $(PDC_DIR)/TODO $(PDC_DIR)/*.spec \
$(PDC_DIR)/version $(PDC_DIR)/Makefile.in $(PDC_DIR)/aclocal.m4 \
$(PDC_DIR)/config.h.in $(PDC_DIR)/configure $(PDC_DIR)/config.guess \
$(PDC_DIR)/x11/xcurses-config.in $(PDC_DIR)/config.sub \
$(PDC_DIR)/configure.ac $(PDC_DIR)/install-sh \
$(PDC_DIR)/version $(PDC_DIR)/libobjs $(PDC_DIR)/Makefile.in \
$(PDC_DIR)/aclocal.m4 $(PDC_DIR)/config.h.in $(PDC_DIR)/configure \
$(PDC_DIR)/config.guess $(PDC_DIR)/x11/xcurses-config.in \
$(PDC_DIR)/config.sub $(PDC_DIR)/configure.ac $(PDC_DIR)/install-sh \
$(PDC_DIR)/curses.h $(PDC_DIR)/curspriv.h $(PDC_DIR)/panel.h \
$(PDC_DIR)/term.h $(PDC_DIR)/maintain.er $(PDC_DIR)/pdcurses/README \
$(PDC_DIR)/pdcurses/*.c $(PDC_DIR)/demos/README \

View File

@@ -19,7 +19,10 @@ MODEL = l
# Nothing below here should require changing.
################################################################################
O = obj
!include $(PDCURSES_HOME)\version
!include $(PDCURSES_HOME)\libobjs
PDCURSES_CURSES_H = $(PDCURSES_HOME)\curses.h
PDCURSES_CURSPRIV_H = $(PDCURSES_HOME)\curspriv.h
@@ -68,20 +71,6 @@ demos: $(DEMOS)
#------------------------------------------------------------------------
LIBOBJS = addch.obj addchstr.obj addstr.obj attr.obj beep.obj bkgd.obj \
border.obj clear.obj color.obj delch.obj deleteln.obj getch.obj \
getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj \
insch.obj insstr.obj instr.obj kernel.obj mouse.obj move.obj outopts.obj \
overlay.obj pad.obj printw.obj refresh.obj scanw.obj scr_dump.obj \
scroll.obj slk.obj termattr.obj terminfo.obj touch.obj util.obj \
window.obj pdcdebug.obj pdcwin.obj
PDCOBJS = pdcclip.obj pdcdisp.obj pdcgetsc.obj pdckbd.obj pdcscrn.obj \
pdcsetsc.obj pdcutil.obj
PANOBJS = panel.obj
$(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
-del $@
$(LIBEXE) $@ @$(osdir)\bccdos.lrf

View File

@@ -18,7 +18,10 @@ PDCURSES_HOME = $(PDCURSES_SRCDIR)
# Nothing below here should require changing.
################################################################################
O = o
include $(PDCURSES_HOME)/version
include $(PDCURSES_HOME)/libobjs
PDCURSES_CURSES_H = $(PDCURSES_HOME)/curses.h
PDCURSES_CURSPRIV_H = $(PDCURSES_HOME)/curspriv.h
@@ -76,19 +79,8 @@ demos: $(DEMOS)
#------------------------------------------------------------------------
LIBOBJS = addch.o addchstr.o addstr.o attr.o beep.o bkgd.o border.o \
clear.o color.o delch.o deleteln.o getch.o getstr.o getyx.o inch.o \
inchstr.o initscr.o inopts.o insch.o insstr.o instr.o kernel.o mouse.o \
move.o outopts.o overlay.o pad.o printw.o refresh.o scanw.o scr_dump.o \
scroll.o slk.o termattr.o terminfo.o touch.o util.o window.o pdcdebug.o \
pdcwin.o
PDCOBJS = pdcclip.o pdcdisp.o pdcgetsc.o pdcgo32.o pdckbd.o pdcscrn.o \
pdcsetsc.o pdcutil.o
PANOBJS = panel.o
#------------------------------------------------------------------------
PDCOBJS = pdcclip.o pdcdisp.o pdcgetsc.o pdckbd.o pdcscrn.o \
pdcsetsc.o pdcutil.o pdcgo32.o
$(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
$(LIBEXE) $(LIBFLAGS) $@ $(LIBOBJS) $(PDCOBJS)

View File

@@ -20,7 +20,10 @@ SIZE = LARGE # one of LARGE, SMALL, MEDIUM, TINY, HUGE, COMPACT
# Nothing below here should require changing.
################################################################################
O = obj
!include $(PDCURSES_HOME)\version
!include $(PDCURSES_HOME)\libobjs
PDCURSES_CURSES_H = $(PDCURSES_HOME)\curses.h
PDCURSES_CURSPRIV_H = $(PDCURSES_HOME)\curspriv.h
@@ -74,20 +77,6 @@ demos: $(DEMOS)
#------------------------------------------------------------------------
LIBOBJS = addch.obj addchstr.obj addstr.obj attr.obj beep.obj bkgd.obj \
border.obj clear.obj color.obj delch.obj deleteln.obj getch.obj \
getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj \
insch.obj insstr.obj instr.obj kernel.obj mouse.obj move.obj outopts.obj \
overlay.obj pad.obj printw.obj refresh.obj scanw.obj scr_dump.obj \
scroll.obj slk.obj termattr.obj terminfo.obj touch.obj util.obj \
window.obj pdcdebug.obj pdcwin.obj
PDCOBJS = pdcclip.obj pdcdisp.obj pdcgetsc.obj pdckbd.obj pdcscrn.obj \
pdcsetsc.obj pdcutil.obj
PANOBJS = panel.obj
$(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
$(LIBEXE) $@ @$(osdir)\mscdos.lrf

View File

@@ -20,7 +20,10 @@ SIZE = LARGE # one of LARGE, SMALL, MEDIUM, TINY, HUGE, COMPACT
# Nothing below here should require changing.
################################################################################
O = objs
!include $(PDCURSES_HOME)\version
!include $(PDCURSES_HOME)\libobjs
PDCURSES_CURSES_H = $(PDCURSES_HOME)\curses.h
PDCURSES_CURSPRIV_H = $(PDCURSES_HOME)\curspriv.h
@@ -74,20 +77,6 @@ demos: $(DEMOS)
#------------------------------------------------------------------------
LIBOBJS = addch.obj addchstr.obj addstr.obj attr.obj beep.obj bkgd.obj \
border.obj clear.obj color.obj delch.obj deleteln.obj getch.obj \
getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj \
insch.obj insstr.obj instr.obj kernel.obj mouse.obj move.obj outopts.obj \
overlay.obj pad.obj printw.obj refresh.obj scanw.obj scr_dump.obj \
scroll.obj slk.obj termattr.obj terminfo.obj touch.obj util.obj \
window.obj pdcdebug.obj pdcwin.obj
PDCOBJS = pdcclip.obj pdcdisp.obj pdcgetsc.obj pdckbd.obj pdcscrn.obj \
pdcsetsc.obj pdcutil.obj
PANOBJS = panel.obj
$(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
$(LIBEXE) $@ @$(osdir)\mscdos.lrf

12
libobjs Normal file
View File

@@ -0,0 +1,12 @@
LIBOBJS = addch.$(O) addchstr.$(O) addstr.$(O) attr.$(O) beep.$(O) \
bkgd.$(O) border.$(O) clear.$(O) color.$(O) delch.$(O) deleteln.$(O) \
getch.$(O) getstr.$(O) getyx.$(O) inch.$(O) inchstr.$(O) initscr.$(O) \
inopts.$(O) insch.$(O) insstr.$(O) instr.$(O) kernel.$(O) mouse.$(O) \
move.$(O) outopts.$(O) overlay.$(O) pad.$(O) printw.$(O) refresh.$(O) \
scanw.$(O) scr_dump.$(O) scroll.$(O) slk.$(O) termattr.$(O) \
terminfo.$(O) touch.$(O) util.$(O) window.$(O) pdcdebug.$(O) pdcwin.$(O)
PDCOBJS = pdcclip.$(O) pdcdisp.$(O) pdcgetsc.$(O) pdckbd.$(O) pdcscrn.$(O) \
pdcsetsc.$(O) pdcutil.$(O)
PANOBJS = panel.$(O)

View File

@@ -1,9 +0,0 @@
+addch.obj +addchstr.obj +addstr.obj +attr.obj +beep.obj +bkgd.obj &
+border.obj +clear.obj +color.obj +delch.obj +deleteln.obj +getch.obj &
+getstr.obj +getyx.obj +inch.obj +inchstr.obj +initscr.obj +inopts.obj &
+insch.obj +insstr.obj +instr.obj +kernel.obj +mouse.obj +move.obj &
+outopts.obj +overlay.obj +pad.obj +printw.obj +refresh.obj +scanw.obj &
+scr_dump.obj +scroll.obj +slk.obj +termattr.obj +terminfo.obj &
+touch.obj +util.obj +window.obj +pdcdebug.obj +pdcclip.obj +pdcdisp.obj &
+pdcgetsc.obj +pdckbd.obj +pdcscrn.obj +pdcsetsc.obj +pdcutil.obj &
+pdcwin.obj ,lib.map

View File

@@ -18,7 +18,10 @@ PDCURSES_HOME = $(PDCURSES_SRCDIR)
# Nothing below here should require changing.
################################################################################
O = obj
!include $(PDCURSES_HOME)\version
!include $(PDCURSES_HOME)\libobjs
PDCURSES_CURSES_H = $(PDCURSES_HOME)\curses.h
PDCURSES_CURSPRIV_H = $(PDCURSES_HOME)\curspriv.h
@@ -66,23 +69,18 @@ demos: $(DEMOS)
#------------------------------------------------------------------------
LIBOBJS = addch.obj addchstr.obj addstr.obj attr.obj beep.obj bkgd.obj \
border.obj clear.obj color.obj delch.obj deleteln.obj getch.obj \
getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj \
insch.obj insstr.obj instr.obj kernel.obj mouse.obj move.obj outopts.obj \
overlay.obj pad.obj printw.obj refresh.obj scanw.obj scr_dump.obj \
scroll.obj slk.obj termattr.obj terminfo.obj touch.obj util.obj \
window.obj pdcdebug.obj pdcwin.obj
PDCOBJS = pdcclip.obj pdcdisp.obj pdcgetsc.obj pdckbd.obj pdcscrn.obj \
pdcsetsc.obj pdcutil.obj
PANOBJS = panel.obj
$(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
-del $@
$(LIBEXE) $@ @$(osdir)\bccos2.lrf
$(LIBEXE) $@ \
+addch.obj +addchstr.obj +addstr.obj +attr.obj +beep.obj +bkgd.obj \
+border.obj +clear.obj +color.obj +delch.obj +deleteln.obj +getch.obj \
+getstr.obj +getyx.obj +inch.obj +inchstr.obj +initscr.obj +inopts.obj \
+insch.obj +insstr.obj +instr.obj +kernel.obj +mouse.obj +move.obj \
+outopts.obj +overlay.obj +pad.obj +printw.obj +refresh.obj +scanw.obj \
+scr_dump.obj +scroll.obj +slk.obj +termattr.obj +terminfo.obj \
+touch.obj +util.obj +window.obj +pdcdebug.obj +pdcclip.obj +pdcdisp.obj \
+pdcgetsc.obj +pdckbd.obj +pdcscrn.obj +pdcsetsc.obj +pdcutil.obj \
+pdcwin.obj ,lib.map
$(LIBPANEL) : $(PANOBJS)
-del $@

View File

@@ -21,7 +21,10 @@ PDCURSES_HOME = $(PDCURSES_SRCDIR)
# Nothing below here should require changing.
################################################################################
O = o
include $(PDCURSES_HOME)/version
include $(PDCURSES_HOME)/libobjs
PDCURSES_CURSES_H = $(PDCURSES_HOME)/curses.h
PDCURSES_CURSPRIV_H = $(PDCURSES_HOME)/curspriv.h
@@ -95,13 +98,6 @@ demos: $(DEMOS)
#------------------------------------------------------------------------
LIBOBJS = addch.o addchstr.o addstr.o attr.o beep.o bkgd.o border.o \
clear.o color.o delch.o deleteln.o getch.o getstr.o getyx.o inch.o \
inchstr.o initscr.o inopts.o insch.o insstr.o instr.o kernel.o mouse.o \
move.o outopts.o overlay.o pad.o printw.o refresh.o scanw.o scr_dump.o \
scroll.o slk.o termattr.o terminfo.o touch.o util.o window.o pdcdebug.o \
pdcwin.o
DLLOBJS = addch.dlo addchstr.dlo addstr.dlo attr.dlo beep.dlo bkgd.dlo \
border.dlo clear.dlo color.dlo delch.dlo deleteln.dlo getch.dlo \
getstr.dlo getyx.dlo inch.dlo inchstr.dlo initscr.dlo inopts.dlo \
@@ -110,14 +106,9 @@ overlay.dlo pad.dlo printw.dlo refresh.dlo scanw.dlo scr_dump.dlo \
scroll.dlo slk.dlo termattr.dlo terminfo.dlo touch.dlo util.dlo \
window.dlo pdcdebug.dlo pdcwin.dlo
PDCOBJS = pdcclip.o pdcdisp.o pdcgetsc.o pdckbd.o pdcscrn.o pdcsetsc.o \
pdcutil.o
PDCDLOS = pdcclip.dlo pdcdisp.dlo pdcgetsc.dlo pdckbd.dlo pdcscrn.dlo \
pdcsetsc.dlo pdcutil.dlo
PANOBJS = panel.o
DEMOOBJS = testcurs.o newdemo.o xmas.o tui.o tuidemo.o firework.o \
ptest.o rain.o worm.o

View File

@@ -18,7 +18,10 @@ PDCURSES_HOME = $(PDCURSES_SRCDIR)
# Nothing below here should require changing.
################################################################################
O = obj
!include $(PDCURSES_HOME)\version
!include $(PDCURSES_HOME)\libobjs
PDCURSES_CURSES_H = $(PDCURSES_HOME)\curses.h
PDCURSES_CURSPRIV_H = $(PDCURSES_HOME)\curspriv.h
@@ -67,19 +70,6 @@ firework.exe ptest.exe rain.exe worm.exe
#------------------------------------------------------------------------
LIBOBJS = addch.obj addchstr.obj addstr.obj attr.obj beep.obj bkgd.obj \
border.obj clear.obj color.obj delch.obj deleteln.obj getch.obj \
getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj \
insch.obj insstr.obj instr.obj kernel.obj mouse.obj move.obj outopts.obj \
overlay.obj pad.obj printw.obj refresh.obj scanw.obj scr_dump.obj \
scroll.obj slk.obj termattr.obj terminfo.obj touch.obj util.obj \
window.obj pdcdebug.obj pdcwin.obj
PDCOBJS = pdcclip.obj pdcdisp.obj pdcgetsc.obj pdckbd.obj pdcscrn.obj \
pdcsetsc.obj pdcutil.obj
PANOBJS = panel.obj
$(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
$(LIBEXE) $@ @$(osdir)\iccos2.lrf

View File

@@ -18,7 +18,10 @@ PDCURSES_HOME = $(PDCURSES_SRCDIR)
# Nothing below here should require changing.
################################################################################
O = obj
!include $(PDCURSES_HOME)\version
!include $(PDCURSES_HOME)\libobjs
PDCURSES_CURSES_H = $(PDCURSES_HOME)\curses.h
PDCURSES_CURSPRIV_H = $(PDCURSES_HOME)\curspriv.h
@@ -66,19 +69,6 @@ demos: $(DEMOS)
#------------------------------------------------------------------------
LIBOBJS = addch.obj addchstr.obj addstr.obj attr.obj beep.obj bkgd.obj \
border.obj clear.obj color.obj delch.obj deleteln.obj getch.obj \
getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj \
insch.obj insstr.obj instr.obj kernel.obj mouse.obj move.obj outopts.obj \
overlay.obj pad.obj printw.obj refresh.obj scanw.obj scr_dump.obj \
scroll.obj slk.obj termattr.obj terminfo.obj touch.obj util.obj \
window.obj pdcdebug.obj pdcwin.obj
PDCOBJS = pdcclip.obj pdcdisp.obj pdcgetsc.obj pdckbd.obj pdcscrn.obj \
pdcsetsc.obj pdcutil.obj
PANOBJS = panel.obj
$(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS)
$(PANOBJS) : $(PANEL_HEADER)
terminfo.obj: $(TERM_HEADER)
@@ -96,7 +86,6 @@ $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
+pdcgetsc.obj +pdckbd.obj +pdcscrn.obj +pdcsetsc.obj +pdcutil.obj \
+pdcwin.obj ,lib.map
$(LIBPANEL) : $(PANOBJS)
-del $@
$(LIBEXE) $@ +$(PANOBJS)

View File

@@ -18,7 +18,10 @@ PDCURSES_HOME = $(PDCURSES_SRCDIR)
# Nothing below here should require changing.
################################################################################
O = o
include $(PDCURSES_HOME)/version
include $(PDCURSES_HOME)/libobjs
PDCURSES_CURSES_H = $(PDCURSES_HOME)/curses.h
PDCURSES_CURSPRIV_H = $(PDCURSES_HOME)/curspriv.h
@@ -70,20 +73,6 @@ demos: $(DEMOS)
#------------------------------------------------------------------------
LIBOBJS = addch.o addchstr.o addstr.o attr.o beep.o bkgd.o border.o \
clear.o color.o delch.o deleteln.o getch.o getstr.o getyx.o inch.o \
inchstr.o initscr.o inopts.o insch.o insstr.o instr.o kernel.o mouse.o \
move.o outopts.o overlay.o pad.o printw.o refresh.o scanw.o scr_dump.o \
scroll.o slk.o termattr.o terminfo.o touch.o util.o window.o pdcdebug.o \
pdcwin.o
PDCOBJS = pdcclip.o pdcdisp.o pdcgetsc.o pdckbd.o pdcscrn.o pdcsetsc.o \
pdcutil.o
PANOBJS = panel.o
#------------------------------------------------------------------------
$(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
$(LIBEXE) $(LIBFLAGS) $@ $(LIBOBJS) $(PDCOBJS)

View File

@@ -18,7 +18,10 @@ PDCURSES_HOME = $(PDCURSES_SRCDIR)
# Nothing below here should require changing.
################################################################################
O = o
include $(PDCURSES_HOME)/version
include $(PDCURSES_HOME)/libobjs
PDCURSES_CURSES_H = $(PDCURSES_HOME)/curses.h
PDCURSES_CURSPRIV_H = $(PDCURSES_HOME)/curspriv.h
@@ -70,20 +73,6 @@ demos: $(DEMOS)
#------------------------------------------------------------------------
LIBOBJS = addch.o addchstr.o addstr.o attr.o beep.o bkgd.o border.o \
clear.o color.o delch.o deleteln.o getch.o getstr.o getyx.o inch.o \
inchstr.o initscr.o inopts.o insch.o insstr.o instr.o kernel.o mouse.o \
move.o outopts.o overlay.o pad.o printw.o refresh.o scanw.o scr_dump.o \
scroll.o slk.o termattr.o terminfo.o touch.o util.o window.o pdcdebug.o \
pdcwin.o
PDCOBJS = pdcclip.o pdcdisp.o pdcgetsc.o pdckbd.o pdcscrn.o pdcsetsc.o \
pdcutil.o
PANOBJS = panel.o
#------------------------------------------------------------------------
$(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)
$(LIBEXE) $(LIBFLAGS) $@ $(LIBOBJS) $(PDCOBJS)

View File

@@ -18,7 +18,10 @@ PDCURSES_HOME = $(PDCURSES_SRCDIR)
# Nothing below here should require changing.
################################################################################
O = obj
!include $(PDCURSES_HOME)\version
!include $(PDCURSES_HOME)\libobjs
PDCURSES_CURSES_H = $(PDCURSES_HOME)\curses.h
PDCURSES_CURSPRIV_H = $(PDCURSES_HOME)\curspriv.h
@@ -82,19 +85,6 @@ clean:
demos: $(DEMOS)
#------------------------------------------------------------------------
LIBOBJS = addch.obj addchstr.obj addstr.obj attr.obj beep.obj bkgd.obj \
border.obj clear.obj color.obj delch.obj deleteln.obj getch.obj \
getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj \
insch.obj insstr.obj instr.obj kernel.obj mouse.obj move.obj outopts.obj \
overlay.obj pad.obj printw.obj refresh.obj scanw.obj scr_dump.obj \
scroll.obj slk.obj termattr.obj terminfo.obj touch.obj util.obj \
window.obj pdcdebug.obj pdcwin.obj
PDCOBJS = pdcclip.obj pdcdisp.obj pdcgetsc.obj pdckbd.obj pdcscrn.obj \
pdcsetsc.obj pdcutil.obj
PANOBJS = panel.obj
LIBDLLS = addch.dlo addchstr.dlo addstr.dlo attr.dlo beep.dlo bkgd.dlo \
border.dlo clear.dlo color.dlo delch.dlo deleteln.dlo getch.dlo \
getstr.dlo getyx.dlo inch.dlo inchstr.dlo initscr.dlo inopts.dlo \