Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 36 → Rev 45

/shark/trunk/config/example.mk
5,6 → 5,9
.PHONY: test all install depend clean cleanall
.PHONY: $(PROGS)
 
#ifndef OSLIB
OSLIB=
#endif
SUBMAKE:=$(BASE)/config/example2.mk
 
test: $(PROGS)
/shark/trunk/config/example2.mk
2,6 → 2,10
ifndef BASE
BASE=../..
endif
ifndef OSLIB
OSLIB=$(BASE)/oslib
endif
 
include $(BASE)/config/config.mk
 
include $(BASE)/config/libdep.mk
/shark/trunk/config/libdep.mk
2,13 → 2,13
# this file contains the library dependencies
#
 
OSLIB_LIB=$(OSLIB)/lib
 
LINK_STARTUP = $(LIB_PATH)/x0.o
LINK_STARTUP = $(OSLIB_LIB)/x0.o
 
LINK_LIB =
LIB_DEP =
 
 
# --------------------------------------------------------------------------
# Library File names
 
80,29 → 80,35
endif
 
# kl
ifeq ($(LIB_PATH)/libkl.a,$(wildcard $(LIB_PATH)/libkl.a))
ifeq ($(OSLIB_LIB)/libkl.a,$(wildcard $(OSLIB_LIB)/libkl.a))
LINK_LIB += -lkl
LIB_DEP += $(LIB_PATH)/libkl.a
LIB_DEP += $(OSLIB_LIB)/libkl.a
endif
 
# hx
ifeq ($(LIB_PATH)/libhx.a,$(wildcard $(LIB_PATH)/libhx.a))
ifeq ($(OSLIB_LIB)/libhx.a,$(wildcard $(OSLIB_LIB)/libhx.a))
LINK_LIB += -lhx
LIB_DEP += $(LIB_PATH)/libhx.a
LIB_DEP += $(OSLIB_LIB)/libhx.a
endif
 
# hc
ifeq ($(LIB_PATH)/libhc.a,$(wildcard $(LIB_PATH)/libhc.a))
ifeq ($(OSLIB_LIB)/libhc.a,$(wildcard $(OSLIB_LIB)/libhc.a))
LINK_LIB += -lhc
LIB_DEP += $(LIB_PATH)/libhc.a
LIB_DEP += $(OSLIB_LIB)/libhc.a
endif
 
# hm
ifeq ($(LIB_PATH)/libhm.a,$(wildcard $(LIB_PATH)/libhm.a))
ifeq ($(OSLIB_LIB)/libhm.a,$(wildcard $(OSLIB_LIB)/libhm.a))
LINK_LIB += -lhm
LIB_DEP += $(LIB_PATH)/libhm.a
LIB_DEP += $(OSLIB_LIB)/libhm.a
endif
 
# cons
ifeq ($(LIB_PATH)/libcons.a,$(wildcard $(LIB_PATH)/libcons.a))
LINK_LIB += -lcons
LIB_DEP += $(LIB_PATH)/libcons.a
endif
 
# blk
ifeq ($(LIB_PATH)/libblk.a,$(wildcard $(LIB_PATH)/libblk.a))
LINK_LIB += -lblk
/shark/trunk/config/mk/gnu.mk
6,8 → 6,11
 
INCL = $(BASE)/include
LIB_PATH = $(BASE)/lib
OSLIB_PATH = $(OSLIB)/lib
LIB_DIR = $(BASE)/lib
OSLIBINCL = $(OSLIB)
 
 
LIBRARYPATHNAME= $(LIB_PATH)/lib$(LIBRARY).a
LIBRARYDIR= $(LIB_PATH)
LIBRARYOBJS= $(LIB_OBJS)
20,7 → 23,7
 
C_WARN = -Wimplicit-function-declaration -Wall
C_FLAGS = -O -finline-functions -fno-builtin -nostdinc
C_INC = -I$(INCL) $(OTHERINCL)
C_INC = -I$(INCL) $(OTHERINCL) -I$(OSLIBINC)
C_MAC = -D__GNU__
 
ASM_WARN =
28,7 → 31,7
ASM_INC = -I$(INCL)
ASM_MAC = -D__GNU__
 
LINK_OPT = -Bstatic -Ttext 0x1720000 -oformat coff-go32 -s -nostartfiles -nostdlib -L$(LIB_PATH)
LINK_OPT = -Bstatic -Ttext 0x1720000 -oformat coff-go32 -s -nostartfiles -nostdlib -L$(LIB_PATH) -L$(OSLIB_PATH)
 
C_OPT = $(C_DEF) $(C_WARN) $(C_INC) $(C_MAC) $(C_FLAGS)
C_OUTPUT = -o $*.o
/shark/trunk/config/mk/linux.mk
5,8 → 5,11
 
 
INCL = $(BASE)/include
LIB_PATH = $(BASE)/lib/
LIB_PATH = $(BASE)/lib
OSLIB_PATH = $(OSLIB)/lib
LIB_DIR = $(BASE)/lib
OSLIBINCL = $(OSLIB)
OTHERINCL =
 
LIBRARYPATHNAME= $(LIB_PATH)/lib$(LIBRARY).a
LIBRARYDIR= $(LIB_PATH)
15,15 → 18,15
 
C_WARN = -Wimplicit-function-declaration -Wall
C_FLAGS = -O -finline-functions -fno-builtin -nostdinc
C_INC = -I$(INCL) $(OTHERINCL)
C_INC = -I$(INCL) $(OTHERINCL) -I$(OSLIBINCL)
C_MAC = -D__LINUX__
 
ASM_WARN =
ASM_FLAGS = -x assembler-with-cpp
ASM_INC = -I$(INCL)
ASM_INC = -I$(INCL) $(OTHERINCL) -I$(OSLIBINC)
ASM_MAC = -D__LINUX__
 
LINK_OPT = -Bstatic -Ttext 0x220000 -s -nostartfiles -nostdlib -L$(LIB_PATH)
LINK_OPT = -Bstatic -Ttext 0x220000 -s -nostartfiles -nostdlib -L$(LIB_PATH) -L$(OSLIB_PATH)
 
C_OPT = $(C_DEF) $(C_WARN) $(C_INC) $(C_MAC) $(C_FLAGS)
C_OUTPUT = -o $*.o