force the tools for get created in the export phase to be used to build xpt files and cleanup otherwise makefiles

git-svn-id: svn://10.0.0.236/trunk@30067 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jband%netscape.com 1999-05-04 03:43:14 +00:00
parent cbedc6b4c8
commit 8a2be521db
4 changed files with 26 additions and 22 deletions

View File

@ -32,5 +32,9 @@ LIBS = \
-lxpt \
$(NULL)
# build these xpt tools early so that it'll be
# available along with xpidl, which also must be built early.
export:: libs
include $(topsrcdir)/config/rules.mk

View File

@ -26,22 +26,22 @@ PROGRAMS = $(PROG1) $(PROG2)
LCFLAGS=-DUSE_NSREG
DEFINES=-DWIN32_LEAN_AND_MEAN -DDEBUG
DEFINES=-DWIN32_LEAN_AND_MEAN
REQUIRES=xpcom libxpt
REQUIRES=libxpt
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\libxpt
LINCS=-I$(PUBLIC)\libxpt
LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\libxpt32.lib \
$(NULL)
include <$(DEPTH)\config\rules.mak>
install:: $(PROGRAMS)
# build these xpt tools early so that it'll be
# available along with xpidl, which also must be built early.
export:: $(PROGRAMS)
-for %p in ($(PROGRAMS)) do $(MAKE_INSTALL) %p $(DIST)\bin
-for %p in ($(TESTCASES)) do $(MAKE_INSTALL) %p $(DIST)\bin
# Move this into config/obj.inc when it's allowed
.c{.\$(OBJDIR)\}.exe:
@ -59,12 +59,10 @@ install:: $(PROGRAMS)
$(CURDIR)$(*B).c
<<KEEP
clean :: clobber
clobber::
-for %p in ($(PROGRAMS)) do $(RM) %p $(DIST)\bin\%p
-for %p in ($(PROGRAMS)) do $(RM) %p
-$(RM) $(DIST)\bin\xpt_dump.exe
-$(RM) $(DIST)\bin\xpt_link.exe
$(PROG1): $(OBJDIR) xpt_dump.c

View File

@ -32,5 +32,9 @@ LIBS = \
-lxpt \
$(NULL)
# build these xpt tools early so that it'll be
# available along with xpidl, which also must be built early.
export:: libs
include $(topsrcdir)/config/rules.mk

View File

@ -26,22 +26,22 @@ PROGRAMS = $(PROG1) $(PROG2)
LCFLAGS=-DUSE_NSREG
DEFINES=-DWIN32_LEAN_AND_MEAN -DDEBUG
DEFINES=-DWIN32_LEAN_AND_MEAN
REQUIRES=xpcom libxpt
REQUIRES=libxpt
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\libxpt
LINCS=-I$(PUBLIC)\libxpt
LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\libxpt32.lib \
$(NULL)
include <$(DEPTH)\config\rules.mak>
install:: $(PROGRAMS)
# build these xpt tools early so that it'll be
# available along with xpidl, which also must be built early.
export:: $(PROGRAMS)
-for %p in ($(PROGRAMS)) do $(MAKE_INSTALL) %p $(DIST)\bin
-for %p in ($(TESTCASES)) do $(MAKE_INSTALL) %p $(DIST)\bin
# Move this into config/obj.inc when it's allowed
.c{.\$(OBJDIR)\}.exe:
@ -59,12 +59,10 @@ install:: $(PROGRAMS)
$(CURDIR)$(*B).c
<<KEEP
clean :: clobber
clobber::
-for %p in ($(PROGRAMS)) do $(RM) %p $(DIST)\bin\%p
-for %p in ($(PROGRAMS)) do $(RM) %p
-$(RM) $(DIST)\bin\xpt_dump.exe
-$(RM) $(DIST)\bin\xpt_link.exe
$(PROG1): $(OBJDIR) xpt_dump.c