Update of /cvsroot/pure-data/externals/miXed In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23253
Modified Files: Makefile.common Log Message: toxy alpha18 and pddp alpha2 (see notes.txt for toxy, pddp and shared)
Index: Makefile.common =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/Makefile.common,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** Makefile.common 10 May 2005 20:26:37 -0000 1.29 --- Makefile.common 30 May 2005 09:29:25 -0000 1.30 *************** *** 75,78 **** --- 75,84 ---- BASE_NAME = $(shell basename `pwd` | awk -F - '{print $$1}')
+ INCLUDES = -I . -I $(PD_DIR) -I $(SHARED_DIR) + + ifdef CAML_TYPES + include $(ROOT_DIR)/Makefile.caml + endif + # CX: control external's main file # AX: audio (tilde) external's main file *************** *** 100,105 **** $(foreach type,$(TYPES),$($(type)_PRIVATEOBJECTS:.o=.c))
- INCLUDES = -I. -I$(PD_DIR) -I$(SHARED_DIR) - ifeq ($(MY_NAME),krzYszcz) WARN_CFLAGS = -Wall -W -Wstrict-prototypes -Werror \ --- 106,109 ---- *************** *** 124,130 **** TYPES_RULE = $(foreach fn,$(call TYPES_EXTERNS,$1),$(OUT_DIR)/$(fn)): \ $(OUT_DIR)/%$($1_TILDE).$(X_SUFFIX) \ ! : $(call TYPES_DIR,$1)%.o $($1_PRIVATEOBJECTS) \ $(foreach obj,$($1_OBJECTS),$(SHARED_DIR)/$(obj)) \ ! ; $(CC) -o $$@ $(CFLAGS) $(LFLAGS) $($1_LIBS) $$+
# LATER find a better way... --- 128,135 ---- 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) \ $(foreach obj,$($1_OBJECTS),$(SHARED_DIR)/$(obj)) \ ! ; $(CC) -o $$@ $(CFLAGS) $(LFLAGS) $$+ $($1_LIBS)
# LATER find a better way... *************** *** 241,245 **** $(SUBDIRS_DEFAULT)
! clean: emptydeps # remove all objects and externs that are contained in current directory -rm -f *.o *.$(X_SUFFIX) --- 246,250 ---- $(SUBDIRS_DEFAULT)
! clean:: emptydeps # remove all objects and externs that are contained in current directory -rm -f *.o *.$(X_SUFFIX)