Adding libxpt and xpconnect to the build.

This commit is contained in:
mccabe%netscape.com 1999-03-25 07:50:11 +00:00
parent 07521245bf
commit 0d46aaa627
16 changed files with 53 additions and 50 deletions

View File

@ -45,6 +45,4 @@ ifdef MOZ_JAVA
DIRS += jsj DIRS += jsj
endif endif
DIRS += tests
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

View File

@ -29,6 +29,8 @@ endif
DIRS += fdlibm DIRS += fdlibm
DIRS += xpconnect
LIBRARY_NAME = $(MOZ_LIB_JS_PREFIX)js LIBRARY_NAME = $(MOZ_LIB_JS_PREFIX)js
ifeq ($(subst /,_,$(shell uname -s)),OS2) ifeq ($(subst /,_,$(shell uname -s)),OS2)

View File

@ -24,15 +24,17 @@ include $(DEPTH)/config/autoconf.mk
MODULE = TestXPC MODULE = TestXPC
SIMPLE_PROGRAMS = TestXPC
CPPSRCS = \ CPPSRCS = \
TestXPC.cpp \ TestXPC.cpp \
$(NULL) $(NULL)
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk
DEFINES += -DJS_THREADSAFE -DJSFILE DEFINES += -DJS_THREADSAFE
LDFLAGS = \ LIBS = \
-L$(DIST)/bin \ -L$(DIST)/bin \
-l$(MOZ_LIB_JS_PREFIX)js \ -l$(MOZ_LIB_JS_PREFIX)js \
-lxpcom \ -lxpcom \
@ -47,25 +49,28 @@ LDFLAGS = \
$(NULL) $(NULL)
PROGS = $(OBJDIR)/TestXPC # PROGS = $(OBJDIR)/TestXPC
TEST_FILES = testxpc.js TEST_FILES = testxpc.js
TARGETS= $(PROGS) # TARGETS= $(PROGS)
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
INCLUDES += -I$(PUBLIC)/xpcom -I$(PUBLIC)/js -I$(PUBLIC)/xpconnect \ # INCLUDES += -I$(PUBLIC)/xpcom -I$(PUBLIC)/js -I$(PUBLIC)/xpconnect \
-I$(PUBLIC)/raptor # -I$(PUBLIC)/raptor
#$(PROGS): $(OBJS) #$(PROGS): $(OBJS)
# @$(MAKE_OBJDIR) # @$(MAKE_OBJDIR)
# $(CC) -o $@ $(OBJS) $(LD_FLAGS) -L$(DIST)/lib $(LIBS) $(OS_LIBS) # $(CC) -o $@ $(OBJS) $(LD_FLAGS) -L$(DIST)/lib $(LIBS) $(OS_LIBS)
export:: $(TARGETS) export::
$(INSTALL) $(PROGS) $(DIST)/bin
$(INSTALL) $(TEST_FILES) $(DIST)/bin $(INSTALL) $(TEST_FILES) $(DIST)/bin
clobber:: # export:: $(TARGETS)
rm -f $(DIST)/bin/TestXPC # $(INSTALL) $(PROGS) $(DIST)/bin
rm -f $(PROGS) $(OBJS) # $(INSTALL) $(TEST_FILES) $(DIST)/bin
# clobber::
# rm -f $(DIST)/bin/TestXPC
# rm -f $(PROGS) $(OBJS)

View File

@ -21,7 +21,7 @@ srcdir = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
DIRS = public src idl DIRS = public src idl libxpt
ifdef ENABLE_TESTS ifdef ENABLE_TESTS
DIRS += tests DIRS += tests

View File

@ -27,6 +27,6 @@ DIRS += tests
DIRS += tools DIRS += tools
# DIRS += xptinfo xptcall DIRS += xptinfo xptcall
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

View File

@ -27,7 +27,7 @@ SIMPLE_PROGRAMS = PrimitiveTest SimpleTypeLib
CSRCS = PrimitiveTest.c SimpleTypeLib.c CSRCS = PrimitiveTest.c SimpleTypeLib.c
LDFLAGS = \ LIBS = \
-L$(DIST)/bin \ -L$(DIST)/bin \
-lxpt \ -lxpt \
$(NSPR_LIBS) \ $(NSPR_LIBS) \

View File

@ -27,7 +27,7 @@ SIMPLE_PROGRAMS = xpt_dump xpt_link
CSRCS = xpt_dump.c xpt_link.c CSRCS = xpt_dump.c xpt_link.c
LDFLAGS = \ LIBS = \
-L$(DIST)/bin \ -L$(DIST)/bin \
-lxpt \ -lxpt \
$(NSPR_LIBS) \ $(NSPR_LIBS) \

View File

@ -24,16 +24,17 @@ include $(DEPTH)/config/autoconf.mk
MODULE = TestXPTC MODULE = TestXPTC
SIMPLE_PROGRAMS = TestXPTCInvoke
CPPSRCS = \ CPPSRCS = \
TestXPTCInvoke.cpp \ TestXPTCInvoke.cpp \
$(NULL) $(NULL)
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk
CFLAGS += -DJS_THREADSAFE -DJSFILE CFLAGS += -DJS_THREADSAFE
LIBS = \
LDFLAGS = \
-L$(DIST)/bin \ -L$(DIST)/bin \
-lxpcom \ -lxpcom \
-lxpt \ -lxpt \
@ -45,22 +46,22 @@ LDFLAGS = \
$(NULL) $(NULL)
PROGS = $(OBJDIR)/TestXPTCInvoke # PROGS = $(OBJDIR)/TestXPTCInvoke
TARGETS= $(PROGS) # TARGETS= $(PROGS)
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
INCLUDES += -I$(PUBLIC)/xpcom -I$(PUBLIC)/js -I$(PUBLIC)/xptcall \ # INCLUDES += -I$(PUBLIC)/xpcom -I$(PUBLIC)/js -I$(PUBLIC)/xptcall \
-I$(PUBLIC)/xptinfo -I$(PUBLIC)/libxpt -I$(PUBLIC)/raptor # -I$(PUBLIC)/xptinfo -I$(PUBLIC)/libxpt -I$(PUBLIC)/raptor
#$(PROGS): $(OBJS) #$(PROGS): $(OBJS)
# @$(MAKE_OBJDIR) # @$(MAKE_OBJDIR)
# $(CC) -o $@ $(OBJS) $(LD_FLAGS) -L$(DIST)/lib $(LIBS) $(OS_LIBS) # $(CC) -o $@ $(OBJS) $(LD_FLAGS) -L$(DIST)/lib $(LIBS) $(OS_LIBS)
export:: $(TARGETS) # export:: $(TARGETS)
$(INSTALL) $(PROGS) $(DIST)/bin # $(INSTALL) $(PROGS) $(DIST)/bin
clobber:: # clobber::
rm -f $(DIST)/bin/TestXPTCInvoke # rm -f $(DIST)/bin/TestXPTCInvoke
rm -f $(PROGS) $(OBJS) # rm -f $(PROGS) $(OBJS)

View File

@ -23,8 +23,6 @@ include $(DEPTH)/config/autoconf.mk
DIRS = public src DIRS = public src
ifdef ENABLE_TESTS
DIRS += tests DIRS += tests
endif
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

View File

@ -31,7 +31,7 @@ CPPSRCS = \
TestInterfaceInfo.cpp \ TestInterfaceInfo.cpp \
$(NULL) $(NULL)
LDFLAGS = \ LIBS = \
-L$(DIST)/bin \ -L$(DIST)/bin \
-lxptinfo \ -lxptinfo \
-lxpt \ -lxpt \

View File

@ -24,16 +24,17 @@ include $(DEPTH)/config/autoconf.mk
MODULE = TestXPTC MODULE = TestXPTC
SIMPLE_PROGRAMS = TestXPTCInvoke
CPPSRCS = \ CPPSRCS = \
TestXPTCInvoke.cpp \ TestXPTCInvoke.cpp \
$(NULL) $(NULL)
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk
CFLAGS += -DJS_THREADSAFE -DJSFILE CFLAGS += -DJS_THREADSAFE
LIBS = \
LDFLAGS = \
-L$(DIST)/bin \ -L$(DIST)/bin \
-lxpcom \ -lxpcom \
-lxpt \ -lxpt \
@ -45,22 +46,22 @@ LDFLAGS = \
$(NULL) $(NULL)
PROGS = $(OBJDIR)/TestXPTCInvoke # PROGS = $(OBJDIR)/TestXPTCInvoke
TARGETS= $(PROGS) # TARGETS= $(PROGS)
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
INCLUDES += -I$(PUBLIC)/xpcom -I$(PUBLIC)/js -I$(PUBLIC)/xptcall \ # INCLUDES += -I$(PUBLIC)/xpcom -I$(PUBLIC)/js -I$(PUBLIC)/xptcall \
-I$(PUBLIC)/xptinfo -I$(PUBLIC)/libxpt -I$(PUBLIC)/raptor # -I$(PUBLIC)/xptinfo -I$(PUBLIC)/libxpt -I$(PUBLIC)/raptor
#$(PROGS): $(OBJS) #$(PROGS): $(OBJS)
# @$(MAKE_OBJDIR) # @$(MAKE_OBJDIR)
# $(CC) -o $@ $(OBJS) $(LD_FLAGS) -L$(DIST)/lib $(LIBS) $(OS_LIBS) # $(CC) -o $@ $(OBJS) $(LD_FLAGS) -L$(DIST)/lib $(LIBS) $(OS_LIBS)
export:: $(TARGETS) # export:: $(TARGETS)
$(INSTALL) $(PROGS) $(DIST)/bin # $(INSTALL) $(PROGS) $(DIST)/bin
clobber:: # clobber::
rm -f $(DIST)/bin/TestXPTCInvoke # rm -f $(DIST)/bin/TestXPTCInvoke
rm -f $(PROGS) $(OBJS) # rm -f $(PROGS) $(OBJS)

View File

@ -23,8 +23,6 @@ include $(DEPTH)/config/autoconf.mk
DIRS = public src DIRS = public src
ifdef ENABLE_TESTS
DIRS += tests DIRS += tests
endif
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

View File

@ -31,7 +31,7 @@ CPPSRCS = \
TestInterfaceInfo.cpp \ TestInterfaceInfo.cpp \
$(NULL) $(NULL)
LDFLAGS = \ LIBS = \
-L$(DIST)/bin \ -L$(DIST)/bin \
-lxptinfo \ -lxptinfo \
-lxpt \ -lxpt \

View File

@ -27,6 +27,6 @@ DIRS += tests
DIRS += tools DIRS += tools
# DIRS += xptinfo xptcall DIRS += xptinfo xptcall
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

View File

@ -27,7 +27,7 @@ SIMPLE_PROGRAMS = PrimitiveTest SimpleTypeLib
CSRCS = PrimitiveTest.c SimpleTypeLib.c CSRCS = PrimitiveTest.c SimpleTypeLib.c
LDFLAGS = \ LIBS = \
-L$(DIST)/bin \ -L$(DIST)/bin \
-lxpt \ -lxpt \
$(NSPR_LIBS) \ $(NSPR_LIBS) \

View File

@ -27,7 +27,7 @@ SIMPLE_PROGRAMS = xpt_dump xpt_link
CSRCS = xpt_dump.c xpt_link.c CSRCS = xpt_dump.c xpt_link.c
LDFLAGS = \ LIBS = \
-L$(DIST)/bin \ -L$(DIST)/bin \
-lxpt \ -lxpt \
$(NSPR_LIBS) \ $(NSPR_LIBS) \