зеркало из https://github.com/mozilla/pjs.git
Some updated to work with nglayout. Others sync'd to remove cruft.
This commit is contained in:
Родитель
110b6652b2
Коммит
1f612e9ddf
|
@ -24,9 +24,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
|
||||
DIRS = public src
|
||||
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += tests
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
|
|
|
@ -1,47 +0,0 @@
|
|||
#!gmake
|
||||
#
|
||||
# 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
|
||||
# compliance with the NPL. You may obtain a copy of the NPL at
|
||||
# http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
# for the specific language governing rights and limitations under the
|
||||
# NPL.
|
||||
#
|
||||
# The Initial Developer of this code under the NPL is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
|
||||
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
LIBRARY_NAME = gmbaseunix
|
||||
|
||||
MODULE=raptor
|
||||
|
||||
REQUIRES=xpcom raptor
|
||||
|
||||
DEFINES += -D_IMPL_NS_WIDGET
|
||||
|
||||
CPPSRCS= \
|
||||
nsTimer.cpp
|
||||
|
||||
CPP_OBJS= \
|
||||
./$(OBJDIR)/nsTimer.o \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
TARGETS = $(LIBRARY)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
@ -17,22 +17,22 @@
|
|||
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = jsurl
|
||||
LIBRARY_NAME = jsurl
|
||||
|
||||
CSRCS = \
|
||||
mkmocha.c \
|
||||
CPPSRCS = \
|
||||
jsurl.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXPORTS= $(srcdir)/jsurl.h
|
||||
|
||||
REQUIRES = network nspr2 dbm util pref js java fileurl \
|
||||
security layer img httpurl lay parse style
|
||||
REQUIRES = network dbm util pref js java fileurl \
|
||||
security layer img httpurl lay parse style dom raptor netlib xpcom
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
@ -45,8 +45,6 @@ ifdef MOZ_JAVA
|
|||
DIRS += jsj
|
||||
endif
|
||||
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += tests
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
@ -50,11 +50,14 @@ EXPORTS = il_types.h \
|
|||
ilINetReader.h \
|
||||
ilIURL.h \
|
||||
dummy_nc.h \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
EXPORTS += \
|
||||
$(JMC_GEN_DIR)/MIMGCBIF.h \
|
||||
$(JMC_GEN_DIR)/MIMGCB.h \
|
||||
$(JMC_GEN_DIR)/MPSIMGCB.h \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
|
|
|
@ -49,6 +49,7 @@ CPPSRCS = nsCacheObject.cpp \
|
|||
CacheStubs.cpp \
|
||||
nsFileStream.cpp \
|
||||
nsMemStream.cpp \
|
||||
nsMonitorable.cpp \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES = dbm pref js xpcom
|
||||
|
|
|
@ -87,7 +87,6 @@ endif
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef ENABLE_TESTS
|
||||
TEST_LIBS = $(LIBRARY) \
|
||||
$(DIST)/lib/liburl.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libsec-us.$(LIB_SUFFIX) \
|
||||
|
@ -98,4 +97,3 @@ TEST_LIBS = $(LIBRARY) \
|
|||
test:
|
||||
$(CC) -g -o $(OBJDIR)/style_test $(CFLAGS) -DSS_TEST stystruc.c $(TEST_LIBS)
|
||||
$(CC) -g -o $(OBJDIR)/stack_test $(CFLAGS) -DTEST_STYLESTACK stystack.c $(TEST_LIBS)
|
||||
endif
|
||||
|
|
|
@ -23,8 +23,6 @@ include $(DEPTH)/config/autoconf.mk
|
|||
|
||||
DIRS = public src
|
||||
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += tests
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
@ -27,15 +27,13 @@ CPPSRCS = RegFactory.cpp TestFactory.cpp
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
CFLAGS += -DUSE_NSREG
|
||||
INCLUDES = -I$(srcdir)/../public -I$(DIST)/include
|
||||
DEFINES += -DUSE_NSREG
|
||||
INCLUDES += -I$(srcdir)/../public -I$(DIST)/include
|
||||
|
||||
EX_LIBS = $(DIST)/lib/libxpcom.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libreg.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
OS_LIBS += $(NSPR_LIBS)
|
||||
|
||||
PROGS = $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))
|
||||
|
||||
TARGETS = $(PROGS)
|
||||
|
@ -43,11 +41,11 @@ TARGETS = $(PROGS)
|
|||
ifeq ($(OS_ARCH),Rhapsody)
|
||||
$(PROGS):$(OBJDIR)/%: $(OBJDIR)/%.o $(EX_LIBS)
|
||||
@$(MAKE_OBJDIR)
|
||||
$(CC) -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(OS_LIBS)
|
||||
$(CC) -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(NSPR_LIBS) $(OS_LIBS)
|
||||
else
|
||||
$(PROGS):$(OBJDIR)/%: $(OBJDIR)/%.o $(EX_LIBS)
|
||||
@$(MAKE_OBJDIR)
|
||||
$(CCC) -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(OS_LIBS)
|
||||
$(CCC) -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(NSPR_LIBS) $(OS_LIBS)
|
||||
endif
|
||||
|
||||
install:: $(PROGS)
|
||||
|
|
Загрузка…
Ссылка в новой задаче