General cleanup.
git-svn-id: svn://10.0.0.236/trunk@47265 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -17,8 +17,8 @@
|
||||
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
|
||||
@@ -17,8 +17,8 @@
|
||||
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
@@ -27,39 +27,30 @@ LIBRARY_NAME = mozreg_s
|
||||
|
||||
REQUIRES = libreg pref js
|
||||
|
||||
CSRCS = reg.c VerReg.c vr_stubs.c
|
||||
PROGRAM = vreg
|
||||
|
||||
CSRCS = reg.c VerReg.c vr_stubs.c
|
||||
|
||||
BIN_SRCS = VerReg.c reg.c vr_stubs.c
|
||||
BIN_OBJS = $(addprefix R_,$(BIN_SRCS:.c=.o))
|
||||
|
||||
MKSHLIB :=
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
# Memory mapped files are not supported under QNX, Neutrino, HP-UX and BeOS
|
||||
ifeq (,$(filter BeOS HP-UX QNX,$(OS_ARCH)))
|
||||
DEFINES += -DUSE_MMAP_REGISTRY_IO
|
||||
CSRCS += mmapio.c
|
||||
endif
|
||||
|
||||
# We don't want a shared lib. Static lib only.
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
# Override gtscc when building vreg on IRIX 5.3.
|
||||
ifeq ($(OS_ARCH)$(OS_RELEASE),IRIX5)
|
||||
ifneq ($(CC),gcc)
|
||||
CC = cc
|
||||
endif
|
||||
# Memory mapped files are not supported under QNX, Neutrino, HP-UX and BeOS
|
||||
ifeq (,$(filter BeOS HP-UX QNX,$(OS_ARCH)))
|
||||
CSRCS += mmapio.c
|
||||
DEFINES += -DUSE_MMAP_REGISTRY_IO
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
INCLUDES += -I$(topsrcdir)/include
|
||||
GARBAGE += $(PROGRAM) $(BIN_OBJS)
|
||||
|
||||
PROGRAM = vreg$(BIN_SUFFIX)
|
||||
|
||||
$(PROGRAM): $(BIN_OBJS)
|
||||
ifeq ($(OS_ARCH), OS2)
|
||||
$(LINK_EXE) -OUT:$@ $(BIN_OBJS) $(LDFLAGS) $(OS_LIBS)
|
||||
@@ -99,5 +90,5 @@ endif
|
||||
$(BIN_OBJS): $(BIN_SRCS)
|
||||
|
||||
install:: $(PROGRAM)
|
||||
$(INSTALL) -m 444 $(PROGRAM) $(DIST)/bin
|
||||
$(INSTALL) -m 444 $< $(DIST)/bin
|
||||
|
||||
|
||||
Reference in New Issue
Block a user