Revision: 9835 http://pure-data.svn.sourceforge.net/pure-data/?rev=9835&view=rev Author: eighthave Date: 2008-05-17 14:31:20 -0700 (Sat, 17 May 2008)

Log Message: ----------- - adding etags target to generate big, fat TAGS file for Pd dev work

- added hexloader to the automatic builds, and added a define to the hexloader.c in order to handle when the loader_t, etc. stuff is defined in a Pd header file, like in Pd-extended.

- minor build tweaks to make the build similar to the rest

Modified Paths: -------------- branches/pd-extended/v0-40/externals/Makefile branches/pd-extended/v0-40/externals/loaders/hexloader/Makefile branches/pd-extended/v0-40/externals/loaders/hexloader/hexloader.c

Modified: branches/pd-extended/v0-40/externals/Makefile =================================================================== --- branches/pd-extended/v0-40/externals/Makefile 2008-05-17 19:18:19 UTC (rev 9834) +++ branches/pd-extended/v0-40/externals/Makefile 2008-05-17 21:31:20 UTC (rev 9835) @@ -1372,7 +1372,7 @@ # IEMLIB IEMLIB_NAME=iemlib # omit the lib files and iem_mp3 (for patent reasons :( ) -IEMLIB_OBJECTS := $(wildcard $(externals_src)/iemlib/iemlib1/src/*[^1].c) $(wildcard $(externals_src)/iemlib/iemlib2/src/*[^2].c) $(wildcard $(externals_src)/iemlib/iemlib_t3_lib/src/t3_*.c) $(wildcard $(externals_src)/iemlib/alias/*.c) +IEMLIB_OBJECTS := $(wildcard $(externals_src)/iemlib/iemlib1/src/*[^1].c) $(wildcard $(externals_src)/iemlib/iemlib2/src/*[^2].c) $(wildcard $(externals_src)/iemlib/iem_t3_lib/src/t3_*.c) $(wildcard $(externals_src)/iemlib/alias/*.c) iemlib: $(IEMLIB_OBJECTS:.c=.$(EXTENSION))

iemlib_install: iemlib @@ -1522,9 +1522,10 @@ #------------------------------------------------------------------------------# # LOADERS LOADERS_NAME= -LOADERS_OBJECTS := $(wildcard $(externals_src)/loaders/*.c) +LOADERS_OBJECTS := $(wildcard $(externals_src)/loaders/*.c) \ + $(externals_src)/loaders/hexloader/hexloader.c loaders: $(LOADERS_OBJECTS:.c=.$(EXTENSION)) - + echo $(LOADERS_OBJECTS) loaders_install: loaders install -d $(objectsdir)/$(LOADERS_NAME) install -p $(LOADERS_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(LOADERS_NAME) @@ -1535,7 +1536,7 @@ # install -p $(externals_src)/loaders/README.txt $(manualsdir)/$(LOADERS_NAME)

loaders_clean: - -rm -f -- $(externals_src)/loaders/*.$(EXTENSION) + -rm -f -- $(LOADERS_OBJECTS:.c=.$(EXTENSION)) -rm -f -- $(externals_src)/loaders/*.o -rm -f -- $(externals_src)/loaders/*.bak -rm -f -- $(externals_src)/loaders/*.*~ @@ -3087,7 +3088,29 @@ # make the symlinks necessary to simulate the installed environment devsymlinks:

+TAGS: etags

+etags: + etags $(pd_src)/src/*.[ch] + find $(externals_src) -type f -name '*.[ch]' -exec etags -a '{}' ; + find $(externals_src) -type f -name '*.cc' -exec etags -a '{}' ; + find $(externals_src) -type f -name '*.cpp' -exec etags -a '{}' ; + find $(extensions_src) -type f -name '*.[ch]' -exec etags -a '{}' ; + find /usr/include -type f -name *.h -exec etags -a '{}' ; + make etags_`uname -s` + +etags_Darwin: + etags -a $(externals_src)/hcs/hid/HID\ Utilities\ Source/*.[ch] + find /System/Library/Frameworks -type f -name *.h -exec etags -a '{}' ; + find /Library/Frameworks -type f -name *.h -exec etags -a '{}' ; + find /sw/include -type f -name *.h -exec etags -a '{}' ; + +etags_Linux: + +etags_MINGW: + find /usr/local/include/ -type f -name *.h -exec etags -a '{}' ; + + #==============================================================================# # # CLEAN TARGETS

Modified: branches/pd-extended/v0-40/externals/loaders/hexloader/Makefile =================================================================== --- branches/pd-extended/v0-40/externals/loaders/hexloader/Makefile 2008-05-17 19:18:19 UTC (rev 9834) +++ branches/pd-extended/v0-40/externals/loaders/hexloader/Makefile 2008-05-17 21:31:20 UTC (rev 9835) @@ -3,8 +3,8 @@

# path to pd ## change this according to your setup! -#PDROOT=../../../pd -PDROOT=/Net/iem/Benutzer/zmoelnig/src/pd-0.41-0test08 +PDROOT=../../../pd +#PDROOT=/Net/iem/Benutzer/zmoelnig/src/pd-0.41-0test08

# here we find the sources of pd (and evtl. the pd.lib) PDSRCDIR=$(PDROOT)/src @@ -15,7 +15,7 @@ EXTENSION=$(MAKECMDGOALS)

-DEFINES=-DPD +DEFINES=-DPD -DMISSING_LOADER_T

# if no filename-extension is supplied by the user # try to guess one, based on what "uname" tells us @@ -92,7 +92,7 @@

DARWININCLUDE = -I$(PDSRCDIR)

-DARWINLDFLAGS = -bundle -undefined suppress -flat_namespace +DARWINLDFLAGS = -bundle -undefined dynamic_lookup

%.pd_darwin: %.c $(CC) $(DARWINCFLAGS) $(DARWININCLUDE) $(DARWINLDFLAGS) -o $*.pd_darwin $*.c

Modified: branches/pd-extended/v0-40/externals/loaders/hexloader/hexloader.c =================================================================== --- branches/pd-extended/v0-40/externals/loaders/hexloader/hexloader.c 2008-05-17 19:18:19 UTC (rev 9834) +++ branches/pd-extended/v0-40/externals/loaders/hexloader/hexloader.c 2008-05-17 21:31:20 UTC (rev 9835) @@ -33,7 +33,7 @@ # include <stdlib.h> # include <unistd.h> #endif -#ifdef __WIN32__ +#ifdef _WIN32 # include <io.h> # include <windows.h> #endif @@ -60,10 +60,12 @@

typedef void (*t_hexloader_setup)(void);

-/* definitions taken from s_loader.c */ +#ifdef MISSING_LOADER_T +/* definitions taken from s_loader.c, since they weren't in header orignally */ typedef int (*loader_t)(t_canvas *canvas, char *classname); void sys_register_loader(loader_t loader); void class_set_extern_dir(t_symbol *s); +#endif

/* ==================================================== */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.