[PD-cvs] externals/miXed Makefile.common,1.14,1.15 quoteinitializer,1.1,1.2
krzyszcz at users.sourceforge.net
krzyszcz at users.sourceforge.net
Wed Feb 25 11:54:44 CET 2004
Update of /cvsroot/pure-data/externals/miXed
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21748
Modified Files:
Makefile.common quoteinitializer
Log Message:
widget tracing backward compatible to tcl8.3
Index: Makefile.common
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/Makefile.common,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile.common 19 Feb 2004 22:23:16 -0000 1.14
--- Makefile.common 25 Feb 2004 10:54:41 -0000 1.15
***************
*** 43,46 ****
--- 43,48 ----
OUT_DIR = $(ROOT_DIR)/bin
+ # for current versions, $(BASE_DIR) equals $(BASE_NAME), for prior versions,
+ # $(BASE_DIR) equals $(BASE_NAME)-$(VERSION)
BASE_DIR = $(shell basename `pwd`)
BASE_NAME = $(shell basename `pwd` | awk -F - '{print $$1}')
***************
*** 56,61 ****
ifdef LX_SOURCES
! LX_NAMES = $(notdir $(LX_SOURCES))
! LX_CLASSES = $(subst _,.,$(LX_NAMES))
endif
--- 58,63 ----
ifdef LX_SOURCES
! LX_NAMES = $(subst _,.,$(notdir $(LX_SOURCES)))
! LX_CLASSES = $(LX_NAMES:.c=)
endif
***************
*** 80,86 ****
EXTERNS = $(foreach fn,$(CX_NAMES:.c=.$(X_SUFFIX)),$(OUT_DIR)/$(fn)) \
$(foreach fn,$(AX_NAMES:.c=~.$(X_SUFFIX)),$(OUT_DIR)/$(fn)) \
- $(foreach fn,$(LX_CLASSES:.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 type,$(TYPES),\
$(foreach fn,$(call TYPES_EXTERNS,$(type)),$(OUT_DIR)/$(fn)))
--- 82,89 ----
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)))
***************
*** 119,122 ****
--- 122,126 ----
SHOBJECTS = $(foreach fn,$(SHARED_OBJECTS),$(SHARED_DIR)/$(fn))
+ LXSHOBJECTS = $(foreach fn,$(LXSHARED_OBJECTS),$(SHARED_DIR)/$(fn))
OBJECTS = $(foreach fn,$(OTHER_SOURCES:.c=.o),$(OBJ_DIR)/$(fn)) \
***************
*** 127,163 ****
.PRECIOUS: %.o
# rules for aliases must precede generic extern rules
! # FIXME
! $(OUT_DIR)/$(BASE_NAME).%~.$(X_SUFFIX): $(BASE_NAME)_loader.c $(SHOBJECTS)
$(CC) -o $@ -Xlinker -defsym \
! -Xlinker $(BASE_NAME).$(*F)_tilde_setup=$(BASE_NAME)_loader_setup \
! $(CFLAGS) $(LFLAGS) $(SHOBJECTS) $<
! $(OUT_DIR)/$(BASE_NAME).%.$(X_SUFFIX): $(BASE_NAME)_loader.c $(SHOBJECTS)
$(CC) -o $@ -Xlinker -defsym \
! -Xlinker $(BASE_NAME).$(*F)_setup=$(BASE_NAME)_loader_setup \
! $(CFLAGS) $(LFLAGS) $(SHOBJECTS) $<
!
! #$(OUT_DIR)/$(BASE_NAME).%.$(X_SUFFIX): $(BASE_NAME)_%.c $(SHOBJECTS)
! # $(CC) -c $(CFLAGS) $<
! # -ld -o $@ -defsym $(BASE_NAME).$(*F)_setup=$(BASE_NAME)_$(*F)_setup \
! # -L $(OUT_DIR) $(LFLAGS) $(SHOBJECTS) \
! # $(BASE_NAME).$(X_SUFFIX) $(BASE_NAME)_$(*F).o
!
! # $(CC) -o $@ -Xlinker -defsym \
! # -Xlinker $(BASE_NAME).$(*F)_setup=$(BASE_NAME)_$(*F)_setup \
! # -Xlinker -rpath -Xlinker $(OUT_DIR) \
! # $(CFLAGS) $(LFLAGS) $(SHOBJECTS) $(BASE_NAME).$(X_SUFFIX) $<
!
! # library stub
! # if not equal BASE_NAME, it has to be declared explicitly in BASE_DIR/Makefile
! # FIXME
! $(OUT_DIR)/$(LX_STUB)_%~.$(X_SUFFIX): $(OUT_DIR)/$(BASE_NAME).$(X_SUFFIX)
! -ln -sf $(BASE_NAME).$(X_SUFFIX) $@
! $(OUT_DIR)/$(LX_STUB)_%.$(X_SUFFIX): $(OUT_DIR)/$(BASE_NAME).$(X_SUFFIX)
! -ln -sf $(BASE_NAME).$(X_SUFFIX) $@
! $(OUT_DIR)/$(LX_STUB).$(X_SUFFIX): $(OUT_DIR)/$(BASE_NAME).$(X_SUFFIX)
! -ln -sf $(BASE_NAME).$(X_SUFFIX) $@
# generic rule for audio externals
--- 131,161 ----
.PRECIOUS: %.o
+ # library stub equals $(BASE_NAME) by default, otherwise
+ # 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 \
+ $(CFLAGS) $(LFLAGS) $(LXSHOBJECTS) $<
+ ifndef LX_STUB
+ LX_STUB = $(LX_STUBCLASS)
+ endif
+ else
+ ifndef LX_STUB
+ LX_STUB = $(BASE_NAME)
+ endif
+ endif
+
# 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 \
! $(CFLAGS) $(LFLAGS) $(LXSHOBJECTS) $<
# generic rule for audio externals
***************
*** 242,250 ****
REL_EXTERNS = $(foreach fn,$(CX_NAMES:.c=.$(X_SUFFIX)),$(REL_BINDIR)/$(fn)) \
$(foreach fn,$(AX_NAMES:.c=~.$(X_SUFFIX)),$(REL_BINDIR)/$(fn)) \
$(REL_LIBNAMES) $(foreach fn,$(RELEASE_APPS),$(REL_BINDIR)/$(fn)) \
$(foreach type,$(TYPES),\
$(foreach fn,$(call TYPES_EXTERNS,$(type)),$(REL_BINDIR)/$(fn)))
! REL_ROOTSRC = LICENSE.txt Makefile.common dumpsetups
srelease: emptydeps define_build
--- 240,252 ----
REL_EXTERNS = $(foreach fn,$(CX_NAMES:.c=.$(X_SUFFIX)),$(REL_BINDIR)/$(fn)) \
$(foreach fn,$(AX_NAMES:.c=~.$(X_SUFFIX)),$(REL_BINDIR)/$(fn)) \
+ $(foreach fn,$(CX_CLASSES:=.$(X_SUFFIX)),$(REL_BINDIR)/$(fn)) \
+ $(foreach fn,$(AX_CLASSES:=~.$(X_SUFFIX)),$(REL_BINDIR)/$(fn)) \
+ $(foreach fn,$(LX_CLASSES:=.$(X_SUFFIX)),$(REL_BINDIR)/$(fn)) \
+ $(if $(LX_STUBCLASS),$(REL_BINDIR)/$(LX_STUBCLASS:=.$(X_SUFFIX))) \
$(REL_LIBNAMES) $(foreach fn,$(RELEASE_APPS),$(REL_BINDIR)/$(fn)) \
$(foreach type,$(TYPES),\
$(foreach fn,$(call TYPES_EXTERNS,$(type)),$(REL_BINDIR)/$(fn)))
! REL_ROOTSRC = LICENSE.txt Makefile.common dumpsetups quoteinitializer
srelease: emptydeps define_build
Index: quoteinitializer
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/quoteinitializer,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** quoteinitializer 19 Feb 2004 22:23:16 -0000 1.1
--- quoteinitializer 25 Feb 2004 10:54:41 -0000 1.2
***************
*** 1,3 ****
! #!/usr/bin/awk -f
BEGIN\
--- 1,3 ----
! #!/usr/bin/gawk -f
BEGIN\
More information about the Pd-cvs
mailing list