Mercurial Mercurial > hg > stx-libbasic / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ApplicationDefinition.st
changeset 23447 56d9f9b89345
parent 23444 ddbf0b007828
child 23451 919b0ee3c96e 
--- a/ApplicationDefinition.st	Sun Oct 14 22:55:53 2018 +0200
+++ b/ApplicationDefinition.st	Sun Oct 14 23:39:40 2018 +0200
@@ -2164,15 +2164,29 @@
 bc_dot_mak_resource_rules
     ^ String streamContents:[:s |
         s nextPutAll:'
-%(APPLICATION)_RESOURCES: 
+%(APPLICATION)_RESOURCES: $(RESOURCES)\%(MODULE)\%(MODULE_PATH)\resources
+        -copy resources\*.rs $(RESOURCES)\%(MODULE)\%(MODULE_PATH)\resources
+
+%(APPLICATION)_BITMAPS: $(RESOURCES)\%(MODULE)\%(MODULE_PATH)\bitmaps
+        -copy bitmaps\*.ico $(RESOURCES)\%(MODULE)\%(MODULE_PATH)\bitmaps
+        -copy bitmaps\*.gif $(RESOURCES)\%(MODULE)\%(MODULE_PATH)\bitmaps
+        -copy bitmaps\*.png $(RESOURCES)\%(MODULE)\%(MODULE_PATH)\bitmaps
+
+$(RESOURCES): 
+        -mkdir $(RESOURCES)
+
+$(RESOURCES)\%(MODULE): $(RESOURCES)
+        -mkdir $(RESOURCES)\%(MODULE)
+
+$(RESOURCES)\%(MODULE)\%(MODULE_PATH): $(RESOURCES)\%(MODULE)
         -mkdir $(RESOURCES)\%(MODULE)\%(MODULE_PATH)
-        -copy ..\resources\*.rs $(RESOURCES)\%(MODULE)\%(MODULE_PATH)\..
-        -copy ..\resources\*.style $(RESOURCES)\%(MODULE)\%(MODULE_PATH)\..
-
-%(APPLICATION)_BITMAPS: 
+
+$(RESOURCES)\%(MODULE)\%(MODULE_PATH)\bitmaps: $(RESOURCES)\%(MODULE)\%(MODULE_PATH)
         -mkdir $(RESOURCES)\%(MODULE)\%(MODULE_PATH)\bitmaps
-        -copy *.ico $(RESOURCES)\%(MODULE)\%(MODULE_PATH)\bitmaps
-        -copy *.gif $(RESOURCES)\%(MODULE)\%(MODULE_PATH)\bitmaps
+
+$(RESOURCES)\%(MODULE)\%(MODULE_PATH)\resources: $(RESOURCES)\%(MODULE)\%(MODULE_PATH)
+        -mkdir $(RESOURCES)\%(MODULE)\%(MODULE_PATH)\resources
+
 '.
     ]
 
@@ -2226,37 +2240,72 @@
 d_win32.rc: $(TOP)\projects\smalltalk\d_win32.rc
         copy $(TOP)\projects\smalltalk\d_win32.rc *.*
 
-stx_STYLES: 
+$(RESOURCES)\stx:  $(RESOURCES)
+        -mkdir $(RESOURCES)\stx
+
+$(RESOURCES)\stx\libview:  $(RESOURCES)\stx
+        -mkdir $(RESOURCES)\stx\libview
+
+$(RESOURCES)\stx\libview\styles:  $(RESOURCES)\stx\libview
         -mkdir $(RESOURCES)\stx\libview\styles
+
+$(RESOURCES)\stx\libview\resources:  $(RESOURCES)\stx\libview
+        -mkdir $(RESOURCES)\stx\libview\resources
+
+$(RESOURCES)\stx\libview2:  $(RESOURCES)\stx
+        -mkdir $(RESOURCES)\stx\libview2
+
+$(RESOURCES)\stx\libview2\resources:  $(RESOURCES)\stx\libview2
+        -mkdir $(RESOURCES)\stx\libview2\resources
+
+$(RESOURCES)\stx\libwidg:  $(RESOURCES)\stx
+        -mkdir $(RESOURCES)\stx\libwidg
+
+$(RESOURCES)\stx\libwidg\bitmaps:  $(RESOURCES)\stx\libwidg
+        -mkdir $(RESOURCES)\stx\libwidg\bitmaps
+
+$(RESOURCES)\stx\libbasic:  $(RESOURCES)\stx
+        -mkdir $(RESOURCES)\stx\libbasic
+
+$(RESOURCES)\stx\libbasic\resources:  $(RESOURCES)\stx\libbasic
+        -mkdir $(RESOURCES)\stx\libbasic\resources
+
+$(RESOURCES)\stx\libtool:  $(RESOURCES)\stx
+        -mkdir $(RESOURCES)\stx\libtool
+
+$(RESOURCES)\stx\libtool\resources:  $(RESOURCES)\stx\libtool
+        -mkdir $(RESOURCES)\stx\libtool\resources
+
+$(RESOURCES)\stx\libtool2:  $(RESOURCES)\stx
+        -mkdir $(RESOURCES)\stx\libtool2
+
+$(RESOURCES)\stx\libtool2\resources:  $(RESOURCES)\stx\libtool2
+        -mkdir $(RESOURCES)\stx\libtool2\resources
+
+stx_STYLES: $(RESOURCES)\stx\libview\styles
         -copy $(TOP)\libview\styles\*.style $(RESOURCES)\stx\libview\styles\*.*
         -copy $(TOP)\libview\styles\*.common $(RESOURCES)\stx\libview\styles\*.*
 
 stx_BITMAPS: \
         libwidg_BITMAPS
 
-libwidg_BITMAPS: 
-        -mkdir $(RESOURCES)\stx\libwidg\bitmaps
+libwidg_BITMAPS: $(RESOURCES)\stx\libwidg\bitmaps
         -copy $(TOP)\libwidg\bitmaps\*.xpm $(RESOURCES)\stx\libwidg\bitmaps\*.*
 
-libbasic_RESOURCES: 
-        -mkdir $(RESOURCES)\stx\libbasic
-        -copy $(TOP)\libbasic\resources\*.rs $(RESOURCES)\stx\libbasic\*.*
-
-libtool_RESOURCES: 
-        -mkdir $(RESOURCES)\stx\libtool
-        -copy $(TOP)\libtool\resources\*.rs $(RESOURCES)\stx\libtool\*.*
-
-libtool2_RESOURCES: 
-        -mkdir $(RESOURCES)\stx\libtool2
-        -copy $(TOP)\libtool2\resources\*.rs $(RESOURCES)\stx\libtool2\*.*
-
-libview_RESOURCES: 
-        -mkdir $(RESOURCES)\stx\libview 
-        -copy $(TOP)\libview\resources\*.rs $(RESOURCES)\stx\libview\*.*
-
-libview2_RESOURCES: 
-        -mkdir $(RESOURCES)\stx\libview2
-        -copy $(TOP)\libview2\resources\*.rs $(RESOURCES)\stx\libview2\*.*
+libbasic_RESOURCES: $(RESOURCES)\stx\libbasic\resources 
+        -copy $(TOP)\libbasic\resources\*.rs $(RESOURCES)\stx\libbasic\resources\*.*
+
+libtool_RESOURCES: $(RESOURCES)\stx\libtool\resources
+        -copy $(TOP)\libtool\resources\*.rs $(RESOURCES)\stx\libtool\resources\*.*
+
+libtool2_RESOURCES: $(RESOURCES)\stx\libtool2\resources
+        -copy $(TOP)\libtool2\resources\*.rs $(RESOURCES)\stx\libtool2\resources\*.*
+
+libview_RESOURCES: $(RESOURCES)\stx\libview\resources
+        -copy $(TOP)\libview\resources\*.rs $(RESOURCES)\stx\libview\resources\*.*
+
+libview2_RESOURCES: $(RESOURCES)\stx\libview2\resources
+        -copy $(TOP)\libview2\resources\*.rs $(RESOURCES)\stx\libview2\resources\*.*
 
 '.
 !
@@ -2558,10 +2607,10 @@
 %(ADDITIONAL_HEADERRULES)
 
 clean::
-        -rm -f *.so *.dylib %(APPLICATION).$(O)
+        -rm -f *.so *.dylib %(APPLICATION).$(O) *.$(H)
 
 clobber:: clean
-        -rm -f %(APPLICATION) *.img *.sav
+        -rm -f %(APPLICATION) $(RESOURCES) *.img *.sav
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
 %(DEPENDENCIES)
@@ -2611,8 +2660,8 @@
     ^ String streamContents:[:s |
         s nextPutAll:'
 %(APPLICATION)_RESOURCES: 
-        mkdir -p $(RESOURCES)/%(MODULE)/%(MODULE_PATH)
-        -cp ../resources/*.rs ../resources/*.style $(RESOURCES)/%(MODULE)/%(MODULE_PATH)/..
+        mkdir -p $(RESOURCES)/%(MODULE)/%(MODULE_PATH)/resources
+        -cp ../resources/*.rs $(RESOURCES)/%(MODULE)/%(MODULE_PATH)/resources
 
 %(APPLICATION)_BITMAPS: 
         mkdir -p $(RESOURCES)/%(MODULE)/%(MODULE_PATH)/bitmaps
@@ -2681,24 +2730,24 @@
         -cp $(TOP)/libwidg/bitmaps/*.* $(RESOURCES)/stx/libwidg/bitmaps
 
 libbasic_RESOURCES: 
-        mkdir -p $(RESOURCES)/stx/libbasic
-        -cp $(TOP)/libbasic/resources/*.* $(RESOURCES)/stx/libbasic
+        mkdir -p $(RESOURCES)/stx/libbasic/resources
+        -cp $(TOP)/libbasic/resources/*.* $(RESOURCES)/stx/libbasic/resources
 
 libtool_RESOURCES: 
-        mkdir -p $(RESOURCES)/stx/libtool
-        -cp $(TOP)/libtool/resources/*.* $(RESOURCES)/stx/libtool
+        mkdir -p $(RESOURCES)/stx/libtool/resources
+        -cp $(TOP)/libtool/resources/*.* $(RESOURCES)/stx/libtool/resources
 
 libtool2_RESOURCES: 
-        mkdir -p $(RESOURCES)/stx/libtool2
-        -cp $(TOP)/libtool2/resources/*.* $(RESOURCES)/stx/libtool2
+        mkdir -p $(RESOURCES)/stx/libtool2/resources
+        -cp $(TOP)/libtool2/resources/*.* $(RESOURCES)/stx/libtool2/resources
 
 libview_RESOURCES: 
-        mkdir -p $(RESOURCES)/stx/libview
-        -cp $(TOP)/libview/resources/*.* $(RESOURCES)/stx/libview
+        mkdir -p $(RESOURCES)/stx/libview/resources
+        -cp $(TOP)/libview/resources/*.* $(RESOURCES)/stx/libview/resources
 
 libview2_RESOURCES: 
-        mkdir -p $(RESOURCES)/stx/libview2
-        -cp $(TOP)/libview2/resources/*.* $(RESOURCES)/stx/libview2
+        mkdir -p $(RESOURCES)/stx/libview2/resources
+        -cp $(TOP)/libview2/resources/*.* $(RESOURCES)/stx/libview2/resources
 
 bitmaps:
         mkdir -p bitmaps
hg/stx-libbasic