]> git.saurik.com Git - wxWidgets.git/blobdiff - Makefile.in
Patch 559673 and 561053
[wxWidgets.git] / Makefile.in
index a4d74526e9f7640861d01ee601bb37ac0249cd8a..f28f1c2794211fc3f66f80acaa0cb2c69ef8edd3 100644 (file)
@@ -301,27 +301,27 @@ SONAME_FLAGS_GL = @SONAME_FLAGS_GL@
 
 all: @WX_ALL@
 
-$(build_libdir)/@WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
+$(build_libdir)/@WX_LIBRARY_NAME_STATIC@: $(OBJECTS)
        @$(INSTALL) -d $(build_libdir)
        @$(RM) $@
        $(AR) $(AROPTIONS) $@ $(OBJECTS)
        $(RANLIB) $@
 
-$(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@:  glcanvas.o
+$(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@: glcanvas.o
        @$(INSTALL) -d $(build_libdir)
        @$(RM) $@
        $(AR) $(AROPTIONS) $@ glcanvas.o
        $(RANLIB) $@
 
-$(build_libdir)/@WX_LIBRARY_NAME_SHARED@:  $(OBJECTS)
+$(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
        @$(INSTALL) -d $(build_libdir)
        $(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS)
 
-$(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@:  glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
+$(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
        @$(INSTALL) -d $(build_libdir)
        $(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o -L$(build_libdir) @WXCONFIG_LIBS@ $(EXTRALIBS) $(OPENGLLIBS)
 
-$(build_libdir)/@WX_RESOURCES_MACOSX@: $(MACRESOURCES)
+$(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES)
        @$(INSTALL) -d $(build_libdir)
        $(RESCOMP) -d __UNIX__ -useDF $^ -o $@
 
@@ -442,12 +442,13 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM
          echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \
        done
 
-preinstall_res: $(build_libdir)/@WX_RESOURCES_MACOSX_COMPILED@
+preinstall_res: $(build_libdir)/@WX_RESOURCES_MACOSX_ASCII@ $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@
        @echo " "
        @echo " Installing wxWindows Mac resource ..."
        @echo " "
        @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
-       $(INSTALL_PROGRAM) $(build_libdir)/@WX_RESOURCES_MACOSX_COMPILED@ $(libdir)/@WX_RESOURCES_MACOSX_COMPILED@
+       $(INSTALL_PROGRAM) $(build_libdir)/@WX_RESOURCES_MACOSX_ASCII@ $(libdir)/@WX_RESOURCES_MACOSX_ASCII@
+       $(INSTALL_PROGRAM) $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@ $(libdir)/@WX_RESOURCES_MACOSX_DATA@
 
 preinstall_gl: $(build_libdir)/@WX_TARGET_LIBRARY_GL@
        @echo " "
@@ -485,11 +486,12 @@ uninstall:
        @$(RM) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
        @$(RM) $(bindir)/wx-config
        @$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config
-       @$(RM) $(datadir)/wx/afm/*
-       @$(RM) $(datadir)/wx/gs_afm/*
+       @$(RM) $(datadir)/wx/$(VER_MAJMIN)/afm/*
+       @$(RM) $(datadir)/wx/$(VER_MAJMIN)/gs_afm/*
 # FIXME: wxBase doesnt install these next 3 dirs.
-       @-rmdir $(datadir)/wx/gs_afm
-       @-rmdir $(datadir)/wx/afm
+       @-rmdir $(datadir)/wx/$(VER_MAJMIN)/gs_afm
+       @-rmdir $(datadir)/wx/$(VER_MAJMIN)/afm
+       @-rmdir $(datadir)/wx/$(VER_MAJMIN)
        @-rmdir $(datadir)/wx
        @echo " Removing headers..."
        @list='$(HEADERS)'; for p in $$list; do \
@@ -1060,6 +1062,13 @@ SAMPLES_DIST: ALL_GUI_DIST
        cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/*.mms $(DISTDIR)/samples/minimal
 
+       mkdir $(DISTDIR)/samples/mobile
+       cp $(SAMPDIR)/mobile/Makefile.in $(DISTDIR)/samples/mobile
+       mkdir $(DISTDIR)/samples/mobile/wxedit
+       cp $(SAMPDIR)/mobile/wxedit/Makefile.in $(DISTDIR)/samples/mobile/wxedit
+       cp $(SAMPDIR)/mobile/wxedit/*.cpp $(DISTDIR)/samples/mobile/wxedit
+       cp $(SAMPDIR)/mobile/wxedit/*.h $(DISTDIR)/samples/mobile/wxedit
+    
        mkdir $(DISTDIR)/samples/dialup
        cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup
        cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup