* ./src/misc/objects.c: two big changes in the object API: now objects can

[vlc] / Makefile

diff --git a/Makefile b/Makefile
index d27c439d5ccb86514ff07a101ad29cc552f0aea0..bef5e835a6527a07cb1fabc7d331d94564a1e32d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -318,12 +318,17 @@ package-win32:
        for file in AUTHORS COPYING ChangeLog README FAQ TODO ; \
                        do cp $$file tmp/$${file}.txt ; \
                        unix2dos tmp/$${file}.txt ; done
-       mkdir tmp/modules
-       cp $(PLUGINS:%=modules/%.so) tmp/modules/ 
-       # don't include these two
-       #rm -f tmp/modules/gtk.so tmp/modules/sdl.so
+       mkdir tmp/plugins
 ifneq (,$(PLUGINS))
-       for i in $(PLUGINS) ; do if test $$i != intfwin ; then $(STRIP) tmp/modules/$$i.so ; fi ; done
+       for i in $(PLUGINS) ; do \
+               DIR=`echo $$i | cut -f1 -d/` ; \
+               mkdir -p tmp/plugins/$$DIR ; \
+               cp modules/$$i.so tmp/plugins/$$DIR ; \
+               if test $$i != gui/win32/win32 ; then \
+                       $(STRIP) \
+                       tmp/plugins/$$DIR/`echo $$i | sed -e 's@.*/@@'`.so ; \
+               fi ; \
+       done
 endif
        mkdir tmp/share
        for file in default8x16.psf default8x9.psf ; \
@@ -410,7 +415,7 @@ src/misc/modules_builtin.h: Makefile.opts Makefile Makefile.config
        @rm -f $@ && cp $@.in $@
 ifneq (,$(BUILTINS))
        @for i in $(BUILTINS) ; do \
-               echo "int vlc_entry__modules_"`echo $$i | sed -e 'y@/@_@ ; s@\..*@@'`"( module_t* );" >>$@; \
+               echo "int vlc_entry__modules_"`echo $$i | sed -e 'y@/@_@' -e 's@\..*@@'`"( module_t* );" >>$@; \
        done
        @echo "" >> $@ ;
 endif
@@ -419,7 +424,7 @@ endif
        @echo "    { \\" >> $@ ;
 ifneq (,$(BUILTINS))
        @for i in $(BUILTINS) ; do \
-               echo "        ALLOCATE_BUILTIN(modules_"`echo $$i | sed -e 'y@/@_@ ; s@\..*@@'`"); \\" >> $@ ; \
+               echo "        ALLOCATE_BUILTIN(modules_"`echo $$i | sed -e 'y@/@_@' -e 's@\..*@@'`"); \\" >> $@ ; \
        done
 endif
        @echo "    } while( 0 );" >> $@ ;
@@ -484,7 +489,7 @@ builtins: Makefile.modules Makefile.opts Makefile.dep Makefile $(BUILTIN_OBJ)
 plugins: Makefile.modules Makefile.opts Makefile.dep Makefile $(PLUGIN_OBJ)
 
 modules/%.a modules/%.so: $(H_OBJ) FORCE
-       cd $(shell echo $@ | sed -e 's@\(.*\)/.*@\1@') && $(MAKE) -f $(shell echo $@ | sed -e 's@[^/]*/@../@g' -e 's@\(.*\)/.*@\1@')/Makefile.modules $(shell echo $@ | sed -e 's@.*/@@') PARENT=$(shell echo $@ | sed -e 's@[^/]*/@../@g' -e 's@\(.*\)/.*@\1@') MODULE_PATH=$(shell echo $@ | sed -e 'y@/@_@ ; s@\..*@@')
+       cd $(shell echo $@ | sed -e 's@\(.*\)/.*@\1@') && $(MAKE) -f $(shell echo $@ | sed -e 's@[^/]*/@../@g' -e 's@\(.*\)/.*@\1@')/Makefile.modules $(shell echo $@ | sed -e 's@.*/@@') PARENT=$(shell echo $@ | sed -e 's@[^/]*/@../@g' -e 's@\(.*\)/.*@\1@') MODULE_PATH=$(shell echo $@ | sed -e 'y@/@_@' -e 's@\..*@@')
 
 #
 # Mozilla plugin target