Update of /cvsroot/pure-data/externals/miXed
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29556
Modified Files:
Makefile.common Makefile.dirs
Log Message:
cyclone alpha55 (see notes.txt for cyclone and shared)
Index: Makefile.common
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/Makefile.common,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** Makefile.common 30 May 2005 09:29:25 -0000 1.30
--- Makefile.common 21 Nov 2005 22:16:36 -0000 1.31
***************
*** 68,72 ****
SHARED_DIR = $(ROOT_DIR)/shared
OBJ_DIR = .
! OUT_DIR = $(ROOT_DIR)/bin
# for current versions, $(BASE_DIR) equals $(BASE_NAME), for prior versions,
--- 68,73 ----
SHARED_DIR = $(ROOT_DIR)/shared
OBJ_DIR = .
! BIN_DIR = $(ROOT_DIR)/bin
! OUT_DIR = $(if $($1_SUBDIR),$(BIN_DIR)/$($1_SUBDIR),$(BIN_DIR))
# for current versions, $(BASE_DIR) equals $(BASE_NAME), for prior versions,
***************
*** 117,131 ****
CFLAGS = $(WARN_CFLAGS) $(OPT_CFLAGS) $(DEFINES) $(INCLUDES)
! EXTERNS = $(foreach fn,$(CX_NAMES:.c=.$(X_SUFFIX)),$(OUT_DIR)/$(fn)) \
! $(foreach fn,$(AX_NAMES:.c=~.$(X_SUFFIX)),$(OUT_DIR)/$(fn)) \
! $(foreach fn,$(CX_CLASSES:=.$(X_SUFFIX)),$(OUT_DIR)/$(fn)) \
! $(foreach fn,$(AX_CLASSES:=~.$(X_SUFFIX)),$(OUT_DIR)/$(fn)) \
! $(foreach fn,$(LX_CLASSES:=.$(X_SUFFIX)),$(OUT_DIR)/$(fn)) \
! $(if $(LX_STUBCLASS),$(OUT_DIR)/$(LX_STUBCLASS:=.$(X_SUFFIX))) \
$(foreach type,$(TYPES),\
! $(foreach fn,$(call TYPES_EXTERNS,$(type)),$(OUT_DIR)/$(fn)))
! TYPES_RULE = $(foreach fn,$(call TYPES_EXTERNS,$1),$(OUT_DIR)/$(fn)): \
! $(OUT_DIR)/%$($1_TILDE).$(X_SUFFIX) \
: $(call TYPES_DIR,$1)%.o \
$($1_PRIVATEOBJECTS) $($1_FOREIGNOBJECTS) \
--- 118,133 ----
CFLAGS = $(WARN_CFLAGS) $(OPT_CFLAGS) $(DEFINES) $(INCLUDES)
! EXTERNS = $(foreach fn,$(CX_NAMES:.c=.$(X_SUFFIX)),$(BIN_DIR)/$(fn)) \
! $(foreach fn,$(AX_NAMES:.c=~.$(X_SUFFIX)),$(BIN_DIR)/$(fn)) \
! $(foreach fn,$(CX_CLASSES:=.$(X_SUFFIX)),$(BIN_DIR)/$(fn)) \
! $(foreach fn,$(AX_CLASSES:=~.$(X_SUFFIX)),$(BIN_DIR)/$(fn)) \
! $(foreach fn,$(LX_CLASSES:=.$(X_SUFFIX)),$(BIN_DIR)/$(fn)) \
! $(if $(LX_STUBCLASS),$(BIN_DIR)/$(LX_STUBCLASS:=.$(X_SUFFIX))) \
$(foreach type,$(TYPES),\
! $(foreach fn,$(call TYPES_EXTERNS,$(type)), \
! $(call OUT_DIR,$(type))/$(fn)))
! TYPES_RULE = $(foreach fn,$(call TYPES_EXTERNS,$1),$(call OUT_DIR,$1)/$(fn)): \
! $(call OUT_DIR,$1)/%$($1_TILDE).$(X_SUFFIX) \
: $(call TYPES_DIR,$1)%.o \
$($1_PRIVATEOBJECTS) $($1_FOREIGNOBJECTS) \
***************
*** 180,184 ****
# it has to be declared explicitly in $(BASE_DIR)/Makefile.sources
ifdef LX_STUBCLASS
! $(OUT_DIR)/$(LX_STUBCLASS).$(X_SUFFIX): $(BASE_NAME)_loader.c $(LXSHOBJECTS)
$(CC) -o $@ -Xlinker -defsym \
-Xlinker $(LX_STUBCLASS)_setup=$(BASE_NAME)_loader_setup \
--- 182,186 ----
# it has to be declared explicitly in $(BASE_DIR)/Makefile.sources
ifdef LX_STUBCLASS
! $(BIN_DIR)/$(LX_STUBCLASS).$(X_SUFFIX): $(BASE_NAME)_loader.c $(LXSHOBJECTS)
$(CC) -o $@ -Xlinker -defsym \
-Xlinker $(LX_STUBCLASS)_setup=$(BASE_NAME)_loader_setup \
***************
*** 195,204 ****
# rules for aliases must precede generic extern rules
! $(OUT_DIR)/$(LX_STUB).%~.$(X_SUFFIX): $(BASE_NAME)_loader.c $(LXSHOBJECTS)
$(CC) -o $@ -Xlinker -defsym \
-Xlinker $(LX_STUB).$(*F)_tilde_setup=$(BASE_NAME)_loader_setup \
$(CFLAGS) $(LFLAGS) $(LXSHOBJECTS) $<
! $(OUT_DIR)/$(LX_STUB).%.$(X_SUFFIX): $(BASE_NAME)_loader.c $(LXSHOBJECTS)
$(CC) -o $@ -Xlinker -defsym \
-Xlinker $(LX_STUB).$(*F)_setup=$(BASE_NAME)_loader_setup \
--- 197,206 ----
# rules for aliases must precede generic extern rules
! $(BIN_DIR)/$(LX_STUB).%~.$(X_SUFFIX): $(BASE_NAME)_loader.c $(LXSHOBJECTS)
$(CC) -o $@ -Xlinker -defsym \
-Xlinker $(LX_STUB).$(*F)_tilde_setup=$(BASE_NAME)_loader_setup \
$(CFLAGS) $(LFLAGS) $(LXSHOBJECTS) $<
! $(BIN_DIR)/$(LX_STUB).%.$(X_SUFFIX): $(BASE_NAME)_loader.c $(LXSHOBJECTS)
$(CC) -o $@ -Xlinker -defsym \
-Xlinker $(LX_STUB).$(*F)_setup=$(BASE_NAME)_loader_setup \
***************
*** 206,214 ****
# generic rule for audio externals
! $(OUT_DIR)/%~.$(X_SUFFIX): $(AX_DIR)%.c $(OBJECTS)
$(CC) -o $@ $(CFLAGS) $(LFLAGS) $(OBJECTS) $<
# generic rule for control externals
! $(OUT_DIR)/%.$(X_SUFFIX): $(CX_DIR)%.c $(OBJECTS)
$(CC) -o $@ $(CFLAGS) $(LFLAGS) $(OBJECTS) $<
--- 208,216 ----
# generic rule for audio externals
! $(BIN_DIR)/%~.$(X_SUFFIX): $(AX_DIR)%.c $(OBJECTS)
$(CC) -o $@ $(CFLAGS) $(LFLAGS) $(OBJECTS) $<
# generic rule for control externals
! $(BIN_DIR)/%.$(X_SUFFIX): $(CX_DIR)%.c $(OBJECTS)
$(CC) -o $@ $(CFLAGS) $(LFLAGS) $(OBJECTS) $<
Index: Makefile.dirs
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/Makefile.dirs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.dirs 10 May 2005 20:26:37 -0000 1.5
--- Makefile.dirs 21 Nov 2005 22:16:36 -0000 1.6
***************
*** 3,12 ****
cyclone \
toxy \
! pddp \
! xeq
RELEASE_DIRS = \
cyclone \
toxy \
! pddp \
! xeq
--- 3,10 ----
cyclone \
toxy \
! pddp
RELEASE_DIRS = \
cyclone \
toxy \
! pddp