diff options
| author | David Mitchell <davem@iabyn.com> | 2016-03-07 11:55:11 +0000 |
|---|---|---|
| committer | David Mitchell <davem@iabyn.com> | 2016-03-18 23:48:15 +0000 |
| commit | 98d35ab7c5b2ec87369ebf4a88451247d2169d08 (patch) | |
| tree | 9b80b31f04670e7baa3463fdd8b024c1dab55829 /os2 | |
| parent | 3f6bd23a1b9204dda7aaaef6efe17dc87f50a675 (diff) | |
| download | perl-98d35ab7c5b2ec87369ebf4a88451247d2169d08.tar.gz | |
Makefile.SH: rationalise object list variables
There are a number of variables in the generated Makefile, such as
'obj' and 'minindt_obj', that enumerate various subsets of the object
files that need to be compiled and linked.
Rename and reorganise these vars slightly, to make the next commit
simpler. In particular it now splits the object files in into 3 sets:
common (av.o etc), those used just by miniperl (opmini.o etc)
and those used just by perl (op.o etc).
Should be no functional changes.
The changes to os2/Makefile.SHs have been done blind. Does anyone still
use OS2?
Diffstat (limited to 'os2')
| -rw-r--r-- | os2/Makefile.SHs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/os2/Makefile.SHs b/os2/Makefile.SHs index 33b51b0a3b..00e785fef1 100644 --- a/os2/Makefile.SHs +++ b/os2/Makefile.SHs @@ -103,8 +103,8 @@ perl_dll_t: t/$(PERL_DLL) t/$(PERL_DLL): $(PERL_DLL) $(LNS) $(PERL_DLL) t/$(PERL_DLL) -$(PERL_DLL): $(obj) perl5.def perl$(OBJ_EXT) perlmain$(OBJ_EXT) $(DYNALOADER) - $(LD) $(LD_OPT) $(LDDLFLAGS) $(PERL_DLL_LD_OPT) -o $@ perl$(OBJ_EXT) $(obj) perlmain$(OBJ_EXT) $(DYNALOADER) $(libs) perl5.def || ( rm $(PERL_DLL) && sh -c false ) +$(PERL_DLL): $(perllib_objs) perl5.def perl$(OBJ_EXT) perlmain$(OBJ_EXT) $(DYNALOADER) + $(LD) $(LD_OPT) $(LDDLFLAGS) $(PERL_DLL_LD_OPT) -o $@ perl$(OBJ_EXT) $(perllib_objs) perlmain$(OBJ_EXT) $(DYNALOADER) $(libs) perl5.def || ( rm $(PERL_DLL) && sh -c false ) perl5.olddef: perl.linkexp echo "LIBRARY '$(PERL_DLL_BASE)' INITINSTANCE TERMINSTANCE" > $@ @@ -142,8 +142,8 @@ miniperl.map: miniperl miniperl.exe: miniperl -miniperl: $(obj) perl$(OBJ_EXT) miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) - $(CC) $(CLDFLAGS) -o miniperl miniperlmain$(OBJ_EXT) perl$(OBJ_EXT) `echo $(obj)|sed -e 's/\bop\./opmini./g'` $(libs) -Zmap -Zlinker /map/PM:VIO +miniperl: $(perllib_objs) perl$(OBJ_EXT) miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) + $(CC) $(CLDFLAGS) -o miniperl miniperlmain$(OBJ_EXT) perl$(OBJ_EXT) `echo $(perllib_objs)|sed -e 's/\bop\./opmini./g'` $(libs) -Zmap -Zlinker /map/PM:VIO @./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest depend: os2ish.h dlfcn.h os2thread.h os2.c @@ -202,7 +202,7 @@ installcmd : # Aout section: -aout_obj = $(addsuffix $(AOUT_OBJ_EXT),$(basename $(obj))) +aout_obj = $(addsuffix $(AOUT_OBJ_EXT),$(basename $(perllib_objs))) AOUT_DYNALOADER = $(addsuffix $(AOUT_LIB_EXT),$(basename $(DYNALOADER))) aout_ext = $(static_ext) $(dynamic_ext) $(AOUT_EXTRA_LIBS) aout_static_ext = $(addsuffix $(AOUT_LIB_EXT),$(basename $(aout_ext))) |