102459 - CPPSRCS in windows makefiles is confusing

Status: RESOLVED FIXED

(SeaMonkey :: Build Config, defect, P3)

Description

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

Having a CPPSRCS list in makefile.win is confusing, since it doesn't do anything
and it lures one into modifying the CPPSRCS list instead of the CPP_OBJS list. 
These only exist in makefiles originating from gecko, basically.

http://lxr.mozilla.org/seamonkey/search?string=CPPSRCS+%3D++%2CCPPSRCS+%3D%09&regexp=on
is a rough attempt at a query to find them.

Comment 1

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

A somewhat noisier but also more thorough query:
http://lxr.mozilla.org/seamonkey/search?string=PPSRCS%3D%2CPPSRCS+%3D++%2CPPSRCS+%3D

Comment 2

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

Attachment: the full list

Comment 3

[hacker formerly known as [e-mail]]

Hey! Leaf's back! ;-)

Comment 4

[Daniel (Leaf) Nunes]

thanks, david. I'll get out my scissors and post something soon.
(i'm even in mountain view! whee!)

Comment 5

[Daniel (Leaf) Nunes]

ok, only two months later and i have a tree with the changes. I'll post a patch
and start a test build; cc'ing mkaply in case for whatever reason OS/2 needs
CPPSRCS defined.

Comment 6

[Daniel (Leaf) Nunes]

Attachment: remove cppsrcs, some whitespace cleanup where tabs were noticed

running test build now.

Comment 7

[Mike Kaply [:mkaply]]

Nope, I don't know how it snuck into an OS/2 Makefile.in except with a block 
copy.

Feel free to kill it there.

Comment 8

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

Comment on attachment 60220 [details] [diff] [review]
remove cppsrcs, some whitespace cleanup where tabs were noticed

r=dbaron, except that nsLayoutDLF shouldn't be part of the build, so don't add
it.  We already have nsContentDLF, and the duplicated code should probably be
cvs-removed at some point.

Comment 9

[Daniel (Leaf) Nunes]

If OS/2 is using the unix build system, CPPSRCS is the right thing to have; my
patch doesn't touch any Makefile.ins

erp, added a file to a CPP_OBJS list that shouldn't have been there, the real
diff for mozilla/layout/build/makefile.win should be:

Index: makefile.win
===================================================================
RCS file: /cvsroot/mozilla/layout/build/makefile.win,v
retrieving revision 3.56
diff -c -r3.56 makefile.win
*** makefile.win	29 Oct 2001 20:15:59 -0000	3.56
--- makefile.win	3 Dec 2001 23:26:58 -0000
***************
*** 38,45 ****
  LIBRARY_NAME=gklayout
  MODULE_NAME=nsLayoutModule
  
- CPPSRCS=dlldeps.cpp nsLayoutDLF.cpp nsLayoutFactory.cpp
- 
  CPP_OBJS=	
		\
  	.\$(OBJDIR)\dlldeps.obj
	\
  	.\$(OBJDIR)\nsLayoutModule.obj	\
--- 38,43 ----

Comment 10

[hacker formerly known as [e-mail]]

Comment on attachment 60220 [details] [diff] [review]
remove cppsrcs, some whitespace cleanup where tabs were noticed

looks good to me. rs=cls

Comment 11

[Daniel (Leaf) Nunes]

fix checked in.