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
endif
DIRS += tests
include $(topsrcdir)/config/rules.mk

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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