Changeset 651 for trunk/client/src


Ignore:
Timestamp:
Nov 4, 2011, 4:05:10 PM (14 years ago)
Author:
Silvan Scherrer
Message:

Samba Client 2.2: adjusted some path to new kbuild

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/client/src/Makefile.kmk

    r649 r651  
    6060ndpsmb_LIBPATH = $(SAMBA)/source3/bin $(Z_LIBDIR)
    6161
    62 ndpsmb_CLEAN = rc/description.rc $(PATH_BIN)/ndpsmb.dll
    63 
     62ndpsmb_CLEAN = rc/description.rc $(PATH_STAGE_LIB)/ndpsmb.dll
    6463
    6564#build other files (e.g. help)
    66 OTHERS = $(PATH_BIN)/en/ndpsmb.hlp $(PATH_BIN)/readme.txt \
    67          $(PATH_BIN)/fr/ndpsmb.hlp $(PATH_BIN)/readme_fr.txt \
    68          $(PATH_BIN)/de/ndpsmb.hlp $(PATH_BIN)/readme_de.txt
    69 OTHER_CLEAN = $(PATH_BIN)/en/ndpsmb.hlp $(PATH_OBJ)/en/ndpsmb.ipf $(PATH_BIN)/readme.txt \
    70               $(PATH_BIN)/fr/ndpsmb.hlp $(PATH_OBJ)/fr/ndpsmb.ipf $(PATH_BIN)/readme_fr.txt \
    71               $(PATH_BIN)/de/ndpsmb.hlp $(PATH_OBJ)/de/ndpsmb.ipf $(PATH_BIN)/readme_de.txt
     65OTHERS = $(PATH_INST_LIB)/en/ndpsmb.hlp $(PATH_INST_LIB)/readme.txt \
     66         $(PATH_INST_LIB)/fr/ndpsmb.hlp $(PATH_INST_LIB)/readme_fr.txt \
     67         $(PATH_INST_LIB)/de/ndpsmb.hlp $(PATH_INST_LIB)/readme_de.txt
     68OTHER_CLEAN += $(PATH_INST_LIB)/en/ndpsmb.hlp $(PATH_OBJ)/en/ndpsmb.ipf $(PATH_INST_LIB)/readme.txt \
     69              $(PATH_INST_LIB)/fr/ndpsmb.hlp $(PATH_OBJ)/fr/ndpsmb.ipf $(PATH_INST_LIB)/readme_fr.txt \
     70              $(PATH_INST_LIB)/de/ndpsmb.hlp $(PATH_OBJ)/de/ndpsmb.ipf $(PATH_INST_LIB)/readme_de.txt
     71
    7272
    7373# install some more files
    7474INSTALLS = ndpsmb-docs
    75 ndpsmb-docs_INST = bin/
     75ndpsmb-docs_INST = lib/
    7676ndpsmb-docs_SOURCES = COPYING resources/ndpsmb.ndp resources/instpl.cmd resources/uninstpl.cmd
    77 OTHER_CLEAN += $(PATH_BIN)/COPYING $(PATH_BIN)/ndpsmb.ndp $(PATH_BIN)/instpl.cmd $(PATH_BIN)/uninstpl.cmd
     77OTHER_CLEAN += $(PATH_INST_LIB)/COPYING $(PATH_INST_LIB)/ndpsmb.ndp $(PATH_INST_LIB)/instpl.cmd $(PATH_INST_LIB)/uninstpl.cmd $(PATH_INST_LIB)/ndpsmb.dll $(PATH_OBJ)/ndpsmb.wis
    7878 
    7979
    … …  
    109109
    110110# compile help file
    111 $(PATH_BIN)/en/ndpsmb.hlp: ./help/ndpsmb.ipf nversion.h Config.kmk ./help/changelog.txt
     111$(PATH_INST_LIB)/en/ndpsmb.hlp: ./help/ndpsmb.ipf nversion.h Config.kmk ./help/changelog.txt
    112112        -@mkdir $(PATH_OBJ)
    113113        -@mkdir $(PATH_OBJ)\en
    114114        @ppwizard.cmd ./help/ndpsmb.ipf /Pack:N /output:$(PATH_OBJ)/en/ndpsmb.ipf /other /WarningsRc:0 /Define:en /Define:ipf
    115         -@mkdir $(PATH_BIN)
    116         -@mkdir $(PATH_BIN)\en
    117         $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/en/ndpsmb.ipf $(PATH_BIN)/en/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
     115        -@mkdir $(PATH_INS)
     116        -@mkdir $(PATH_INST_LIB)
     117        -@mkdir $(PATH_INST_LIB)\en
     118        $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/en/ndpsmb.ipf $(PATH_INST_LIB)/en/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
    118119
    119 $(PATH_BIN)/fr/ndpsmb.hlp: ./help/ndpsmb_fr.ipf nversion.h Config.kmk ./help/changelog.txt
     120$(PATH_INST_LIB)/fr/ndpsmb.hlp: ./help/ndpsmb_fr.ipf nversion.h Config.kmk ./help/changelog.txt
    120121        -@mkdir $(PATH_OBJ)
    121122        -@mkdir $(PATH_OBJ)\fr
    122123        @ppwizard.cmd ./help/ndpsmb_fr.ipf /Pack:N /output:$(PATH_OBJ)/fr/ndpsmb.ipf /other /WarningsRc:0 /Define:fr /Define:ipf
    123         -@mkdir $(PATH_BIN)
    124         -@mkdir $(PATH_BIN)\fr
    125         $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/fr/ndpsmb.ipf $(PATH_BIN)/fr/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
     124        -@mkdir $(PATH_INST_LIB)
     125        -@mkdir $(PATH_INST_LIB)\fr
     126        $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/fr/ndpsmb.ipf $(PATH_INST_LIB)/fr/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
    126127
    127 $(PATH_BIN)/de/ndpsmb.hlp: ./help/ndpsmb_de.ipf nversion.h Config.kmk ./help/changelog.txt
     128$(PATH_INST_LIB)/de/ndpsmb.hlp: ./help/ndpsmb_de.ipf nversion.h Config.kmk ./help/changelog.txt
    128129        -@mkdir $(PATH_OBJ)
    129130        -@mkdir $(PATH_OBJ)\de
    130131        @ppwizard.cmd ./help/ndpsmb_de.ipf /Pack:N /output:$(PATH_OBJ)/de/ndpsmb.ipf /other /WarningsRc:0 /Define:de /Define:ipf
    131         -@mkdir $(PATH_BIN)
    132         -@mkdir $(PATH_BIN)\de
    133         $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/de/ndpsmb.ipf $(PATH_BIN)/de/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
     132        -@mkdir $(PATH_INST_LIB)
     133        -@mkdir $(PATH_INST_LIB)\de
     134        $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/de/ndpsmb.ipf $(PATH_INST_LIB)/de/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
    134135
    135136
    … …  
    142143
    143144# substitute macros in docs
    144 $(PATH_BIN)/readme.txt: Config.kmk ./help/readme.txt nversion.h ./help/changelog.txt
    145         @ppwizard.cmd ./help/readme.txt /option:KeepIndent=On /option:LeaveBlankLines=On /Pack:N /output:$(PATH_BIN)/readme.txt /other /WarningsRc:0 /Define:en /Define:txt
     145$(PATH_INST_LIB)/readme.txt: Config.kmk ./help/readme.txt nversion.h ./help/changelog.txt
     146        @ppwizard.cmd ./help/readme.txt /option:KeepIndent=On /option:LeaveBlankLines=On /Pack:N /output:$(PATH_INST_LIB)/readme.txt /other /WarningsRc:0 /Define:en /Define:txt
    146147
    147 $(PATH_BIN)/readme_fr.txt: Config.kmk ./help/readme_fr.txt nversion.h ./help/changelog.txt
    148         @ppwizard.cmd ./help/readme_fr.txt /option:KeepIndent=On /option:LeaveBlankLines=On /Pack:N /output:$(PATH_BIN)/readme_fr.txt /other /WarningsRc:0 /Define:fr /Define:txt
     148$(PATH_INST_LIB)/readme_fr.txt: Config.kmk ./help/readme_fr.txt nversion.h ./help/changelog.txt
     149        @ppwizard.cmd ./help/readme_fr.txt /option:KeepIndent=On /option:LeaveBlankLines=On /Pack:N /output:$(PATH_INST_LIB)/readme_fr.txt /other /WarningsRc:0 /Define:fr /Define:txt
    149150
    150 $(PATH_BIN)/readme_de.txt: Config.kmk ./help/readme_de.txt nversion.h ./help/changelog.txt
    151         @ppwizard.cmd ./help/readme_de.txt /option:KeepIndent=On /option:LeaveBlankLines=On /Pack:N /output:$(PATH_BIN)/readme_de.txt /other /WarningsRc:0 /Define:de /Define:txt
     151$(PATH_INST_LIB)/readme_de.txt: Config.kmk ./help/readme_de.txt nversion.h ./help/changelog.txt
     152        @ppwizard.cmd ./help/readme_de.txt /option:KeepIndent=On /option:LeaveBlankLines=On /Pack:N /output:$(PATH_INST_LIB)/readme_de.txt /other /WarningsRc:0 /Define:de /Define:txt
    152153
    153154# final: zip all files!
    154155$(PATH_ROOT)/dist/$(PACKAGE_NAME).zip: \
    155                 $(PATH_BIN)/instpl.cmd \
    156                 $(PATH_BIN)/uninstpl.cmd \
    157                 $(PATH_BIN)/ndpsmb.dll \
    158                 $(PATH_BIN)/COPYING \
    159                 $(PATH_BIN)/en/ndpsmb.hlp \
    160                 $(PATH_BIN)/fr/ndpsmb.hlp \
    161                 $(PATH_BIN)/de/ndpsmb.hlp \
    162                 $(PATH_BIN)/readme.txt \
    163                 $(PATH_BIN)/readme_fr.txt \
    164                 $(PATH_BIN)/readme_de.txt
     156                $(PATH_INST_LIB)/instpl.cmd \
     157                $(PATH_INST_LIB)/uninstpl.cmd \
     158                $(PATH_INST_LIB)/ndpsmb.dll \
     159                $(PATH_INST_LIB)/COPYING \
     160                $(PATH_INST_LIB)/en/ndpsmb.hlp \
     161                $(PATH_INST_LIB)/fr/ndpsmb.hlp \
     162                $(PATH_INST_LIB)/de/ndpsmb.hlp \
     163                $(PATH_INST_LIB)/readme.txt \
     164                $(PATH_INST_LIB)/readme_fr.txt \
     165                $(PATH_INST_LIB)/readme_de.txt
    165166        $(QUIET)$(MKDIR) -p $(PATH_ROOT)/dist                             
    166167        $(QUIET)$(RM) -f $@
    167         $(QUIET)$(REDIRECT) -C $(PATH_BIN) -- zip -Sr9 $@ \* 
     168        $(QUIET)$(REDIRECT) -C $(PATH_INST_LIB) -- zip -Sr9 $@ \* 
    168169
    169170
    … …  
    171172$(PATH_ROOT)/dist/$(PACKAGE_NAME).wpi: \
    172173                ./resources/ndpsmb.tpl \
    173                 $(PATH_BIN)/instpl.cmd \
    174                 $(PATH_BIN)/uninstpl.cmd \
    175                 $(PATH_BIN)/ndpsmb.dll \
    176                 $(PATH_BIN)/COPYING \
    177                 $(PATH_BIN)/en/ndpsmb.hlp \
    178                 $(PATH_BIN)/fr/ndpsmb.hlp \
    179                 $(PATH_BIN)/de/ndpsmb.hlp \
    180                 $(PATH_BIN)/readme.txt \
    181                 $(PATH_BIN)/readme_fr.txt \
    182                 $(PATH_BIN)/readme_de.txt
     174                $(PATH_INST_LIB)/instpl.cmd \
     175                $(PATH_INST_LIB)/uninstpl.cmd \
     176                $(PATH_INST_LIB)/ndpsmb.dll \
     177                $(PATH_INST_LIB)/COPYING \
     178                $(PATH_INST_LIB)/en/ndpsmb.hlp \
     179                $(PATH_INST_LIB)/fr/ndpsmb.hlp \
     180                $(PATH_INST_LIB)/de/ndpsmb.hlp \
     181                $(PATH_INST_LIB)/readme.txt \
     182                $(PATH_INST_LIB)/readme_fr.txt \
     183                $(PATH_INST_LIB)/readme_de.txt
    183184        $(QUIET)$(MKDIR) -p $(PATH_ROOT)/dist                             
    184185        $(QUIET)$(RM) -f $@
    185186        @ppwizard.cmd resources/ndpsmb.tpl /Pack:N /output:$(PATH_OBJ)/ndpsmb.wis /other /WarningsRc:0
    186         $(QUIET)$(REDIRECT) -C $(PATH_BIN) -- runwic.cmd $(subst /,\\,$@) -a 2 -r ".\en\*.hlp"
    187         $(QUIET)$(REDIRECT) -C $(PATH_BIN) -- runwic.cmd $(subst /,\\,$@) -a 3 -r ".\fr\*.hlp"
    188         $(QUIET)$(REDIRECT) -C $(PATH_BIN) -- runwic.cmd $(subst /,\\,$@) -a 4 -r ".\de\*.hlp"
    189         $(QUIET)$(REDIRECT) -C $(PATH_BIN) -- runwic.cmd $(subst /,\\,$@) -s $(subst /,\\,$(PATH_OBJ))\\ndpsmb.wis -a 1 "*"
     187        $(QUIET)$(REDIRECT) -C $(PATH_INST_LIB) -- runwic.cmd $(subst /,\\,$@) -a 2 -r ".\en\*.hlp"
     188        $(QUIET)$(REDIRECT) -C $(PATH_INST_LIB) -- runwic.cmd $(subst /,\\,$@) -a 3 -r ".\fr\*.hlp"
     189        $(QUIET)$(REDIRECT) -C $(PATH_INST_LIB) -- runwic.cmd $(subst /,\\,$@) -a 4 -r ".\de\*.hlp"
     190        $(QUIET)$(REDIRECT) -C $(PATH_INST_LIB) -- runwic.cmd $(subst /,\\,$@) -s $(subst /,\\,$(PATH_OBJ))\\ndpsmb.wis -a 1 "*"
Note: See TracChangeset for help on using the changeset viewer.