General cleanup.

This commit is contained in:
briano%netscape.com 1999-09-11 04:39:15 +00:00
parent bfce118cad
commit 0a4cd946e5
6 changed files with 26 additions and 30 deletions

View File

@ -1,3 +1,4 @@
#
# The contents of this file are subject to the Netscape Public License # The contents of this file are subject to the Netscape Public License
# Version 1.0 (the "NPL"); you may not use this file except in # Version 1.0 (the "NPL"); you may not use this file except in
# compliance with the NPL. You may obtain a copy of the NPL at # compliance with the NPL. You may obtain a copy of the NPL at
@ -12,11 +13,12 @@
# Communications Corporation. Portions created by Netscape are # Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights # Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved. # Reserved.
#
DEPTH = ../../.. DEPTH = ../../..
topsrcdir = @top_srcdir@ topsrcdir = @top_srcdir@
VPATH = @srcdir@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
@ -27,3 +29,4 @@ DIRS += tests shell
endif endif
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

View File

@ -1,3 +1,4 @@
#
# The contents of this file are subject to the Mozilla Public License # The contents of this file are subject to the Mozilla Public License
# Version 1.1 (the "MPL"); you may not use this file except in # Version 1.1 (the "MPL"); you may not use this file except in
# compliance with the MPL. You may obtain a copy of the MPL at # compliance with the MPL. You may obtain a copy of the MPL at
@ -12,34 +13,26 @@
# Communications Corporation. Portions created by Netscape are # Communications Corporation. Portions created by Netscape are
# Copyright (C) 1999 Netscape Communications Corporation. All Rights # Copyright (C) 1999 Netscape Communications Corporation. All Rights
# Reserved. # Reserved.
#
DEPTH = ../../../.. DEPTH = ../../../..
topsrcdir = @top_srcdir@ topsrcdir = @top_srcdir@
VPATH = @srcdir@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconk.mk include $(DEPTH)/config/autoconk.mk
LIBRARY_NAME = jsloader
MODULE = jsloader MODULE = jsloader
LIBRARY_NAME = jsloader
IS_COMPONENT = 1
CPPSRCS = \ CPPSRCS = mozJSComponentLoader.cpp
mozJSComponentLoader.cpp \
$(NULL)
include $(topsrcdir)/config/config.mk
IS_COMPONENT=1
ifneq ($(OS_ARCH),BeOS)
LIBS += \
-lmozjs \
-lxpcom \
$(NSPR_LIBS) \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
DEFINES += -DJSFILE -DJS_THREADSAFE DEFINES += -DJSFILE -DJS_THREADSAFE
ifneq ($(OS_ARCH),BeOS)
LIBS += -lmozjs -lxpcom $(NSPR_LIBS)
endif

View File

@ -17,8 +17,8 @@
DEPTH = ../../../.. DEPTH = ../../../..
topsrcdir = @top_srcdir@ topsrcdir = @top_srcdir@
VPATH = @srcdir@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk

View File

@ -22,8 +22,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = xpconnect
MODULE = xpconnect MODULE = xpconnect
LIBRARY_NAME = xpconnect
CPPSRCS = \ CPPSRCS = \
nsXPConnect.cpp \ nsXPConnect.cpp \

View File

@ -17,8 +17,8 @@
DEPTH = ../../../.. DEPTH = ../../../..
topsrcdir = @top_srcdir@ topsrcdir = @top_srcdir@
VPATH = @srcdir@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
@ -38,13 +38,13 @@ LIBS = \
$(NULL) $(NULL)
TEST_FILES = \ TEST_FILES = \
$(srcdir)/testxpc.js \ $(srcdir)/testxpc.js \
$(srcdir)/xpctest_echo.js \ $(srcdir)/xpctest_echo.js \
$(srcdir)/xpctest_ids.js \ $(srcdir)/xpctest_ids.js \
$(srcdir)/xpctest_overloaded.js \ $(srcdir)/xpctest_overloaded.js \
$(srcdir)/xpctest_enum_create.js \ $(srcdir)/xpctest_enum_create.js \
$(srcdir)/xpctest_primitives.js $(srcdir)/xpctest_primitives.js \
$(NULL)
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

View File

@ -22,8 +22,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = xpctest
MODULE = xpctest MODULE = xpctest
LIBRARY_NAME = xpctest
IS_COMPONENT = 1 IS_COMPONENT = 1
CPPSRCS = \ CPPSRCS = \