Changeset 91

Timestamp:

10/02/06 11:28:16 (2 years ago)

Author:

ludovic.rousseau

Message:

use "touch $@" instead of "touch rule-name" to have more similar rules

Location:

trunk

Files:

• Makefile (modified) (11 diffs)
• Makefile_i386 (modified) (15 diffs)
• Makefile_light (modified) (14 diffs)
• Makefile_light_i386 (modified) (7 diffs)

trunk/Makefile

@@ -66 +66 @@
         rm -f package-pcscd_autostart
         rm -rf compiled-pcscd_autostart
-        rm -f build-pcscd_autostart package-pcscd_autostart 
+        rm -f build-pcscd_autostart package-pcscd_autostart
 
 clean-opensc_tokend:
@@ -76 +76 @@
         rm -f sca-$(SCAVERSION).dmg*
         rm -rf sca.mpkg
-        
+
 clean-i386:
         rm -rf compiled-*-i386
@@ -105 +105 @@
         # curl -O http://www.opensc-project.org/files/opensc/snapshots/$@
         # curl -O http://www.opensc-project.org/files/opensc/testing/$@
-        
+
 libp11-$(LIBP11VERSION).tar.gz:
         curl -O http://www.opensc-project.org/files/libp11/$@
@@ -287 +287 @@
 build-tokend-end:
         hdiutil detach $(TOKEND_IMAGE_NAME)
-        
+
 build-pcscd_autostart:
         mkdir compiled-pcscd_autostart
         cp -R pcscd_autostart/files/* compiled-pcscd_autostart
         touch $@
-        
+
 lipo: lipo-openssl lipo-opensc lipo-engine lipo-libp11 lipo-openssh lipo-libusb lipo-ifd-egate
-        
+
 lipo-openssl: compiled-openssl-i386
         cd compiled-openssl/Library/OpenSC/bin/ && \
@@ -338 +338 @@
         lipo -create libubsec.so ../../../../../compiled-openssl-i386/Library/OpenSC/lib/engines/libubsec.so -output libubsec_univ.so && \
         mv -f libubsec_univ.so libubsec.so
-        touch lipo-openssl
+        touch $@
 
 lipo-opensc: compiled-opensc-i386
@@ -404 +404 @@
         lipo -create pkcs11-spy.a ../../../../compiled-opensc-i386/Library/OpenSC/lib/pkcs11-spy.a -output pkcs11-spy_univ.a && \
         mv -f pkcs11-spy_univ.a pkcs11-spy.a
-        touch lipo-opensc
-        
+        touch $@
+
 lipo-engine: compiled-engine-i386
         cd compiled-engine/Library/OpenSC/lib/engines/ && \
@@ -413 +413 @@
         lipo -create engine_pkcs11.so ../../../../../compiled-engine-i386/Library/OpenSC/lib/engines/engine_pkcs11.so -output engine_pkcs11-univ.so && \
         mv -f engine_pkcs11-univ.so engine_pkcs11.so
-        touch lipo-engine
-        
+        touch $@
+
 lipo-libp11: compiled-libp11-i386
         cd compiled-libp11/Library/OpenSC/lib/ && \
@@ -422 +422 @@
         lipo -create libp11.a ../../../../compiled-libp11-i386/Library/OpenSC/lib/libp11.a -output libp11-univ.a && \
         mv -f libp11-univ.a libp11.a
-        touch lipo-libp11
-        
+        touch $@
+
 lipo-openssh: compiled-openssh-i386
         cd compiled-openssh/Library/OpenSC/bin/ && \
@@ -437 +437 @@
         lipo -create scssh-keygen ../../../../compiled-openssh-i386/Library/OpenSC/bin/scssh-keygen -output scssh-keygen_univ && \
         mv -f scssh-keygen_univ scssh-keygen
-        touch lipo-openssh
-        
+        touch $@
+
 lipo-libusb: compiled-libusb-i386
         cd compiled-libusb/Library/OpenSC/lib/ && \
@@ -452 +452 @@
         lipo -create libusbpp.a ../../../../compiled-libusb-i386/Library/OpenSC/lib/libusbpp.a -output libusbpp-univ.a && \
         mv -f libusbpp-univ.a libusbpp.a
-        touch lipo-libusb
+        touch $@
 
 lipo-ifd-egate: compiled-ifd-egate-i386
@@ -458 +458 @@
         lipo -create libifd_egate.dylib ../../../../../../../../compiled-ifd-egate-i386/usr/libexec/SmartCardServices/drivers/ifd-egate.bundle/Contents/MacOS/libifd_egate.dylib -output libifd_egate-univ.dylib && \
         mv -f libifd_egate-univ.dylib libifd_egate.dylib
-        touch lipo-ifd-egate
+        touch $@
 
 install:

trunk/Makefile_i386

@@ -33 +33 @@
         rm -rf compiled-engine-i386
         rm -f fetch-engine build-engine
-        
+
 clean-openssh:
         rm -rf openssh
         rm -rf compiled-openssh-i386
         rm -f fetch-openssh build-openssh
-        
+
 clean-libusb:
         rm -rf libusb
@@ -52 +52 @@
         curl -O http://www.openssl.org/source/$@
         #curl -O http://mirrors.usc.edu/pub/openssl/snapshot/$@
-        
+
 opensc-$(OPENSCVERSION).tar.gz:
         curl -O http://www.opensc-project.org/files/opensc/$@
         # curl -O http://www.opensc-project.org/files/opensc/snapshots/$@
         # curl -O http://www.opensc-project.org/files/opensc/testing/$@
-        
+
 libp11-$(LIBP11VERSION).tar.gz:
         curl -O http://www.opensc-project.org/files/libp11/$@
@@ -77 +77 @@
         tar xzvf $^
         mv openssl-$(OPENSSLVERSION) openssl
-        touch fetch-openssl
-        
+        touch $@
+
 fetch-opensc: opensc-$(OPENSCVERSION).tar.gz
         rm -rf opensc
         tar xzvf $^
         mv opensc-$(OPENSCVERSION) opensc
-        touch fetch-opensc
+        touch $@
 
 fetch-libp11: libp11-$(LIBP11VERSION).tar.gz
@@ -89 +89 @@
         tar xzvf $^
         mv libp11-$(LIBP11VERSION) libp11
-        touch fetch-libp11
+        touch $@
 
 fetch-engine: engine_pkcs11-$(ENGINEVERSION).tar.gz
@@ -95 +95 @@
         tar xzvf $^
         mv engine_pkcs11-$(ENGINEVERSION) engine_pkcs11
-        touch fetch-engine
+        touch $@
 
 fetch-openssh: openssh-$(OPENSSHVERSION).tar.gz
@@ -102 +102 @@
         mv openssh-$(OPENSSHVERSION) openssh
         cd openssh && patch -p1 <../opensc/src/openssh/ask-for-pin.diff
-        touch fetch-openssh
+        touch $@
 
 fetch-libusb: libusb-$(LIBUSBVERSION).tar.gz
@@ -108 +108 @@
         tar xzvf $^
         mv libusb-$(LIBUSBVERSION) libusb
-        touch fetch-libusb
+        touch $@
 
 fetch-ifd-egate: ifd-egate-$(IFDEGATEVERSION)-patched.tar.gz
@@ -114 +114 @@
         tar xzvf $^
         mv ifd-egate-$(IFDEGATEVERSION) ifd-egate
-        touch fetch-ifd-egate
+        touch $@
 
 build-openssl: fetch-openssl
@@ -122 +122 @@
         make INSTALL_PREFIX=$(BUILDHOME)/compiled-openssl-i386 install
         rm -f $(BUILDHOME)/compiled-openssl-i386/Library/OpenSC/bin/openssl_fips_fingerprint
-        touch build-openssl
-        
+        touch $@
+
 build-opensc: fetch-opensc
         cd opensc && \
@@ -131 +131 @@
         make && \
         make install prefix=$(BUILDHOME)/compiled-opensc-i386/Library/OpenSC
-        touch build-opensc
-        
+        touch $@
+
 build-libp11: fetch-libp11
         cd libp11 && \
@@ -140 +140 @@
         make && \
         make install prefix=$(BUILDHOME)/compiled-libp11-i386/Library/OpenSC
-        touch build-libp11
+        touch $@
 
 build-engine: fetch-engine
@@ -149 +149 @@
         make && \
         make install prefix=$(BUILDHOME)/compiled-engine-i386/Library/OpenSC
-        touch build-engine
+        touch $@
 
 build-openssh: fetch-openssh
@@ -186 +186 @@
         cd $(BUILDHOME)/compiled-openssh-i386/Library/OpenSC/man/man1/ && ln -s ./scssh.1 scslogin.1
         mv $(BUILDHOME)/compiled-openssh-i386/Library/OpenSC/man/man5/ssh_config.5 $(BUILDHOME)/compiled-openssh-i386/Library/OpenSC/man/man5/scssh_config.5
-        touch build-openssh
+        touch $@
 
 build-libusb: fetch-libusb
@@ -193 +193 @@
         make && \
         make install prefix=$(BUILDHOME)/compiled-libusb-i386/Library/OpenSC
-        touch build-libusb
+        touch $@
 
 build-ifd-egate: fetch-ifd-egate
@@ -203 +203 @@
         cp ifd-egate/Info.plist-OSX $(BUILDHOME)/compiled-ifd-egate-i386/usr/libexec/SmartCardServices/drivers/ifd-egate.bundle/Contents/Info.plist
         cp ifd-egate/libifd_egate.dylib $(BUILDHOME)/compiled-ifd-egate-i386/usr/libexec/SmartCardServices/drivers/ifd-egate.bundle/Contents/MacOS
-        touch build-ifd-egate
+        touch $@

trunk/Makefile_light

@@ -37 +37 @@
         rm -f package-pcscd_autostart
         rm -rf compiled-pcscd_autostart
-        rm -f build-pcscd_autostart package-pcscd_autostart 
+        rm -f build-pcscd_autostart package-pcscd_autostart
 
 clean-opensc_tokend:
@@ -49 +49 @@
         rm -rf sca_light.mpkg
         rm -rf reader_light.mpkg
-        
+
 clean-i386:
         rm -rf compiled-*-i386
@@ -77 +77 @@
         # curl -O http://www.opensc-project.org/files/opensc/snapshots/$@
         # curl -O http://www.opensc-project.org/files/opensc/testing/$@
-        
+
 ifd-egate-$(IFDEGATEVERSION)-patched.tar.gz:
         curl -O http://www.luusa.org/~wbx/sc/$@
@@ -90 +90 @@
         tar xzvf $^
         mv opensc-$(OPENSCVERSION) opensc
-        touch fetch-opensc
+        touch $@
 
 fetch-libusb: libusb-$(LIBUSBVERSION).tar.gz
@@ -96 +96 @@
         tar xzvf $^
         mv libusb-$(LIBUSBVERSION) libusb
-        touch fetch-libusb
+        touch $@
 
 fetch-ifd-egate: ifd-egate-$(IFDEGATEVERSION)-patched.tar.gz
@@ -102 +102 @@
         tar xzvf $^
         mv ifd-egate-$(IFDEGATEVERSION) ifd-egate
-        touch fetch-ifd-egate
+        touch $@
 
 build: build-opensc build-libusb build-ifd-egate build-tokend \
@@ -114 +114 @@
         make && \
         make install prefix=$(BUILDHOME)/compiled-opensc/Library/OpenSC
-        touch build-opensc
+        touch $@
 
 build-libusb: fetch-libusb
@@ -121 +121 @@
         make && \
         make install prefix=$(BUILDHOME)/compiled-libusb/Library/OpenSC
-        touch build-libusb
+        touch $@
 
 build-ifd-egate: fetch-ifd-egate
@@ -131 +131 @@
         cp ifd-egate/Info.plist-OSX $(BUILDHOME)/compiled-ifd-egate/usr/libexec/SmartCardServices/drivers/ifd-egate.bundle/Contents/Info.plist
         cp ifd-egate/libifd_egate.dylib $(BUILDHOME)/compiled-ifd-egate/usr/libexec/SmartCardServices/drivers/ifd-egate.bundle/Contents/MacOS
-        touch build-ifd-egate
+        touch $@
 
 build-tokend:
@@ -150 +150 @@
         $(BUILDHOME)/compiled-opensc_tokend/System/Library/Security/tokend/OpenSC.tokend/Contents/MacOS/OpenSC \
         -create -output $(BUILDHOME)/compiled-opensc_tokend/System/Library/Security/tokend/OpenSC.tokend/Contents/MacOS/OpenSC
-        touch build-tokend
+        touch $@
 
 build-tokend-end:
         hdiutil detach $(TOKEND_IMAGE_NAME)
-        
+
 build-pcscd_autostart:
         mkdir compiled-pcscd_autostart
         cp -R pcscd_autostart/files/* compiled-pcscd_autostart
-        touch build-pcscd_autostart
-        
+        touch $@
+
 lipo: lipo-opensc lipo-libusb lipo-ifd-egate
-        
+
 lipo-opensc: compiled-opensc-i386
         cd compiled-opensc/Library/OpenSC/bin/ && \
@@ -226 +226 @@
         lipo -create pkcs11-spy.a ../../../../compiled-opensc-i386/Library/OpenSC/lib/pkcs11-spy.a -output pkcs11-spy_univ.a && \
         mv -f pkcs11-spy_univ.a pkcs11-spy.a
-        touch lipo-opensc
-        
+        touch $@
+
 lipo-libusb: compiled-libusb-i386
         cd compiled-libusb/Library/OpenSC/lib/ && \
@@ -241 +241 @@
         lipo -create libusbpp.a ../../../../compiled-libusb-i386/Library/OpenSC/lib/libusbpp.a -output libusbpp-univ.a && \
         mv -f libusbpp-univ.a libusbpp.a
-        touch lipo-libusb
+        touch $@
 
 lipo-ifd-egate: compiled-ifd-egate-i386
@@ -247 +247 @@
         lipo -create libifd_egate.dylib ../../../../../../../../compiled-ifd-egate-i386/usr/libexec/SmartCardServices/drivers/ifd-egate.bundle/Contents/MacOS/libifd_egate.dylib -output libifd_egate-univ.dylib && \
         mv -f libifd_egate-univ.dylib libifd_egate.dylib
-        touch lipo-ifd-egate
+        touch $@
 
 install:
@@ -271 +271 @@
         cp opensc-pack/InstallationCheck.strings OpenSC.pkg/Contents/Resources/English.lproj
         cp opensc-pack/InstallationCheck.strings OpenSC.pkg/Contents/Resources
-        touch package-opensc
+        touch $@
 
 package-libusb: build-libusb
         $(PACKAGEMAKER) -build -p libusb.pkg -f compiled-libusb -v -ds \
         -i libusb-pack/Info.plist -d libusb-pack/Description.plist
-        touch package-libusb
+        touch $@
 
 package-ifd-egate: build-ifd-egate
         $(PACKAGEMAKER) -build -p ifd-egate.pkg -f compiled-ifd-egate -v -ds \
         -i ifd-egate-pack/Info.plist -d ifd-egate-pack/Description.plist
-        touch package-ifd-egate
+        touch $@
 
 package-pcscd_autostart: build-pcscd_autostart
         $(PACKAGEMAKER) -build -p pcscd_autostart.pkg -f compiled-pcscd_autostart -v -ds \
         -i pcscd_autostart/Info.plist -r pcscd_autostart/resources -d pcscd_autostart/Description.plist
-        touch package-pcscd_autostart
+        touch $@
 
 package-opensc_tokend: build-tokend
         $(PACKAGEMAKER) -build -p opensc_tokend.pkg -f compiled-opensc_tokend -v -ds \
         -i opensc_tokend-pack/Info.plist -d opensc_tokend-pack/Description.plist
-        touch package-opensc_tokend
+        touch $@
 
 uninstall-all: uninstall-pcscd_autostart uninstall

trunk/Makefile_light_i386

@@ -29 +29 @@
         # curl -O http://www.opensc-project.org/files/opensc/snapshots/$@
         # curl -O http://www.opensc-project.org/files/opensc/testing/$@
-        
+
 ifd-egate-$(IFDEGATEVERSION)-patched.tar.gz:
         curl -O http://www.luusa.org/~wbx/sc/$@
@@ -40 +40 @@
         tar xzvf $^
         mv opensc-$(OPENSCVERSION) opensc
-        touch fetch-opensc
+        touch $@
 
 fetch-libusb: libusb-$(LIBUSBVERSION).tar.gz
@@ -46 +46 @@
         tar xzvf $^
         mv libusb-$(LIBUSBVERSION) libusb
-        touch fetch-libusb
+        touch $@
 
 fetch-ifd-egate: ifd-egate-$(IFDEGATEVERSION)-patched.tar.gz
@@ -52 +52 @@
         tar xzvf $^
         mv ifd-egate-$(IFDEGATEVERSION) ifd-egate
-        touch fetch-ifd-egate
+        touch $@
 
 build-opensc: fetch-opensc
@@ -61 +61 @@
         make && \
         make install prefix=$(BUILDHOME)/compiled-opensc-i386/Library/OpenSC
-        touch build-opensc
-        
+        touch $@
+
 build-libusb: fetch-libusb
         cd libusb && \
@@ -68 +68 @@
         make && \
         make install prefix=$(BUILDHOME)/compiled-libusb-i386/Library/OpenSC
-        touch build-libusb
+        touch $@
 
 build-ifd-egate: fetch-ifd-egate
@@ -78 +78 @@
         cp ifd-egate/Info.plist-OSX $(BUILDHOME)/compiled-ifd-egate-i386/usr/libexec/SmartCardServices/drivers/ifd-egate.bundle/Contents/Info.plist
         cp ifd-egate/libifd_egate.dylib $(BUILDHOME)/compiled-ifd-egate-i386/usr/libexec/SmartCardServices/drivers/ifd-egate.bundle/Contents/MacOS
-        touch build-ifd-egate
+        touch $@