November 2005 - 389-commits - Fedora Mailing-Lists

[Fedora-directory-commits] winsync/passwordsync/passsync passsync.mak, 1.6, 1.7

by Doctor Conrad

Author: nkinder Update of /cvs/dirsec/winsync/passwordsync/passsync In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18135/passwordsync/passsync Modified Files: passsync.mak Log Message: Remove carriage returns from nmake makefiles Index: passsync.mak =================================================================== RCS file: /cvs/dirsec/winsync/passwordsync/passsync/passsync.mak,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- passsync.mak 10 Nov 2005 00:36:50 -0000 1.6 +++ passsync.mak 10 Nov 2005 04:18:09 -0000 1.7 @@ -1,261 +1,261 @@ -# -# BEGIN COPYRIGHT BLOCK -# This Program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; version 2 of the License. -# -# This Program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA. -# -# In addition, as a special exception, Red Hat, Inc. gives You the additional -# right to link the code of this Program with code not covered under the GNU -# General Public License ("Non-GPL Code") and to distribute linked combinations -# including the two, subject to the limitations in this paragraph. Non-GPL Code -# permitted under this exception must only link to the code of this Program -# through those well defined interfaces identified in the file named EXCEPTION -# found in the source code files (the "Approved Interfaces"). The files of -# Non-GPL Code may instantiate templates or use macros or inline functions from -# the Approved Interfaces without causing the resulting work to be covered by -# the GNU General Public License. Only Red Hat, Inc. may make changes or -# additions to the list of Approved Interfaces. You must obey the GNU General -# Public License in all respects for all of the Program code and other code used -# in conjunction with the Program except the Non-GPL Code covered by this -# exception. If you modify this file, you may extend this exception to your -# version of the file, but you are not obligated to do so. If you do not wish to -# provide this exception without modification, you must delete this exception -# statement from your version and license this file solely under the GPL without -# exception. -# -# -# Copyright (C) 2005 Red Hat, Inc. -# All rights reserved. -# END COPYRIGHT BLOCK -# -# nmake Makefile for passsync.exe -# -!IF "$(CFG)" == "" -CFG=passsync - Win32 Debug -!MESSAGE No configuration specified. Defaulting to passsync - Win32 Debug. -!ENDIF - -!IF "$(CFG)" != "passsync - Win32 Release" && "$(CFG)" != "passsync - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "passsync.mak" CFG="passsync - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "passsync - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "passsync - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "passsync - Win32 Release" - -OUTDIR=$(OBJDEST)\passsync -INTDIR=$(OBJDEST)\passsync -# Begin Custom Macros -OutDir=$(OBJDEST)\passsync -# End Custom Macros - -ALL : "$(OUTDIR)\passsync.exe" - - -CLEAN : - -@erase "$(INTDIR)\ntservice.obj" - -@erase "$(INTDIR)\passhand.obj" - -@erase "$(INTDIR)\service.obj" - -@erase "$(INTDIR)\subuniutil.obj" - -@erase "$(INTDIR)\syncserv.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(OUTDIR)\passsync.exe" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\passsync.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\passsync.pdb" /machine:I386 /out:"$(OUTDIR)\passsync.exe" -LINK32_OBJS= \ - "$(INTDIR)\ntservice.obj" \ - "$(INTDIR)\passhand.obj" \ - "$(INTDIR)\service.obj" \ - "$(INTDIR)\subuniutil.obj" \ - "$(INTDIR)\syncserv.obj" - -"$(OUTDIR)\passsync.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "passsync - Win32 Debug" - -OUTDIR=$(OBJDEST)\passsync -INTDIR=$(OBJDEST)\passsync -# Begin Custom Macros -OutDir=$(OBJDEST)\passsync -# End Custom Macros - -ALL : "$(OUTDIR)\passsync.exe" - - -CLEAN : - -@erase "$(INTDIR)\ntservice.obj" - -@erase "$(INTDIR)\passhand.obj" - -@erase "$(INTDIR)\service.obj" - -@erase "$(INTDIR)\subuniutil.obj" - -@erase "$(INTDIR)\syncserv.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\passsync.exe" - -@erase "$(OUTDIR)\passsync.ilk" - -@erase "$(OUTDIR)\passsync.pdb" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\passsync.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=nss3.lib libplc4.lib libnspr4.lib nsldappr32v50.lib nsldapssl32v50.lib nsldap32v50.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\passsync.pdb" /debug /machine:I386 /out:"$(OUTDIR)\passsync.exe" -LINK32_OBJS= \ - "$(INTDIR)\ntservice.obj" \ - "$(INTDIR)\passhand.obj" \ - "$(INTDIR)\service.obj" \ - "$(INTDIR)\subuniutil.obj" \ - "$(INTDIR)\syncserv.obj" - -"$(OUTDIR)\passsync.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("passsync.dep") -!INCLUDE "passsync.dep" -!ELSE -!MESSAGE Warning: cannot find "passsync.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "passsync - Win32 Release" || "$(CFG)" == "passsync - Win32 Debug" -SOURCE=.\ntservice.cpp - -"$(INTDIR)\ntservice.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=..\passhand.cpp - -"$(INTDIR)\passhand.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\service.cpp - -"$(INTDIR)\service.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\subuniutil.cpp - -"$(INTDIR)\subuniutil.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE=.\syncserv.cpp - -"$(INTDIR)\syncserv.obj" : $(SOURCE) "$(INTDIR)" - - - -!ENDIF - +# +# BEGIN COPYRIGHT BLOCK +# This Program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation; version 2 of the License. +# +# This Program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple +# Place, Suite 330, Boston, MA 02111-1307 USA. +# +# In addition, as a special exception, Red Hat, Inc. gives You the additional +# right to link the code of this Program with code not covered under the GNU +# General Public License ("Non-GPL Code") and to distribute linked combinations +# including the two, subject to the limitations in this paragraph. Non-GPL Code +# permitted under this exception must only link to the code of this Program +# through those well defined interfaces identified in the file named EXCEPTION +# found in the source code files (the "Approved Interfaces"). The files of +# Non-GPL Code may instantiate templates or use macros or inline functions from +# the Approved Interfaces without causing the resulting work to be covered by +# the GNU General Public License. Only Red Hat, Inc. may make changes or +# additions to the list of Approved Interfaces. You must obey the GNU General +# Public License in all respects for all of the Program code and other code used +# in conjunction with the Program except the Non-GPL Code covered by this +# exception. If you modify this file, you may extend this exception to your +# version of the file, but you are not obligated to do so. If you do not wish to +# provide this exception without modification, you must delete this exception +# statement from your version and license this file solely under the GPL without +# exception. +# +# +# Copyright (C) 2005 Red Hat, Inc. +# All rights reserved. +# END COPYRIGHT BLOCK +# +# nmake Makefile for passsync.exe +# +!IF "$(CFG)" == "" +CFG=passsync - Win32 Debug +!MESSAGE No configuration specified. Defaulting to passsync - Win32 Debug. +!ENDIF + +!IF "$(CFG)" != "passsync - Win32 Release" && "$(CFG)" != "passsync - Win32 Debug" +!MESSAGE Invalid configuration "$(CFG)" specified. +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "passsync.mak" CFG="passsync - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "passsync - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "passsync - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE +!ERROR An invalid configuration is specified. +!ENDIF + +!IF "$(OS)" == "Windows_NT" +NULL= +!ELSE +NULL=nul +!ENDIF + +!IF "$(CFG)" == "passsync - Win32 Release" + +OUTDIR=$(OBJDEST)\passsync +INTDIR=$(OBJDEST)\passsync +# Begin Custom Macros +OutDir=$(OBJDEST)\passsync +# End Custom Macros + +ALL : "$(OUTDIR)\passsync.exe" + + +CLEAN : + -@erase "$(INTDIR)\ntservice.obj" + -@erase "$(INTDIR)\passhand.obj" + -@erase "$(INTDIR)\service.obj" + -@erase "$(INTDIR)\subuniutil.obj" + -@erase "$(INTDIR)\syncserv.obj" + -@erase "$(INTDIR)\vc60.idb" + -@erase "$(OUTDIR)\passsync.exe" + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +CPP=cl.exe +CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c + +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\passsync.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\passsync.pdb" /machine:I386 /out:"$(OUTDIR)\passsync.exe" +LINK32_OBJS= \ + "$(INTDIR)\ntservice.obj" \ + "$(INTDIR)\passhand.obj" \ + "$(INTDIR)\service.obj" \ + "$(INTDIR)\subuniutil.obj" \ + "$(INTDIR)\syncserv.obj" + +"$(OUTDIR)\passsync.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ELSEIF "$(CFG)" == "passsync - Win32 Debug" + +OUTDIR=$(OBJDEST)\passsync +INTDIR=$(OBJDEST)\passsync +# Begin Custom Macros +OutDir=$(OBJDEST)\passsync +# End Custom Macros + +ALL : "$(OUTDIR)\passsync.exe" + + +CLEAN : + -@erase "$(INTDIR)\ntservice.obj" + -@erase "$(INTDIR)\passhand.obj" + -@erase "$(INTDIR)\service.obj" + -@erase "$(INTDIR)\subuniutil.obj" + -@erase "$(INTDIR)\syncserv.obj" + -@erase "$(INTDIR)\vc60.idb" + -@erase "$(INTDIR)\vc60.pdb" + -@erase "$(OUTDIR)\passsync.exe" + -@erase "$(OUTDIR)\passsync.ilk" + -@erase "$(OUTDIR)\passsync.pdb" + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +CPP=cl.exe +CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c + +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\passsync.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=nss3.lib libplc4.lib libnspr4.lib nsldappr32v50.lib nsldapssl32v50.lib nsldap32v50.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\passsync.pdb" /debug /machine:I386 /out:"$(OUTDIR)\passsync.exe" +LINK32_OBJS= \ + "$(INTDIR)\ntservice.obj" \ + "$(INTDIR)\passhand.obj" \ + "$(INTDIR)\service.obj" \ + "$(INTDIR)\subuniutil.obj" \ + "$(INTDIR)\syncserv.obj" + +"$(OUTDIR)\passsync.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + + +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("passsync.dep") +!INCLUDE "passsync.dep" +!ELSE +!MESSAGE Warning: cannot find "passsync.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "passsync - Win32 Release" || "$(CFG)" == "passsync - Win32 Debug" +SOURCE=.\ntservice.cpp + +"$(INTDIR)\ntservice.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=..\passhand.cpp + +"$(INTDIR)\passhand.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\service.cpp + +"$(INTDIR)\service.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=.\subuniutil.cpp + +"$(INTDIR)\subuniutil.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=.\syncserv.cpp + +"$(INTDIR)\syncserv.obj" : $(SOURCE) "$(INTDIR)" + + + +!ENDIF +

18 years, 5 months

1
0
0 / 0

[Fedora-directory-commits] winsync/passwordsync/passhook passhook.mak, 1.9, 1.10

by Doctor Conrad

Author: nkinder Update of /cvs/dirsec/winsync/passwordsync/passhook In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18135/passwordsync/passhook Modified Files: passhook.mak Log Message: Remove carriage returns from nmake makefiles Index: passhook.mak =================================================================== RCS file: /cvs/dirsec/winsync/passwordsync/passhook/passhook.mak,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- passhook.mak 10 Nov 2005 00:36:45 -0000 1.9 +++ passhook.mak 10 Nov 2005 04:18:04 -0000 1.10 @@ -1,246 +1,246 @@ -# -# BEGIN COPYRIGHT BLOCK -# This Program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; version 2 of the License. -# -# This Program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA. -# -# In addition, as a special exception, Red Hat, Inc. gives You the additional -# right to link the code of this Program with code not covered under the GNU -# General Public License ("Non-GPL Code") and to distribute linked combinations -# including the two, subject to the limitations in this paragraph. Non-GPL Code -# permitted under this exception must only link to the code of this Program -# through those well defined interfaces identified in the file named EXCEPTION -# found in the source code files (the "Approved Interfaces"). The files of -# Non-GPL Code may instantiate templates or use macros or inline functions from -# the Approved Interfaces without causing the resulting work to be covered by -# the GNU General Public License. Only Red Hat, Inc. may make changes or -# additions to the list of Approved Interfaces. You must obey the GNU General -# Public License in all respects for all of the Program code and other code used -# in conjunction with the Program except the Non-GPL Code covered by this -# exception. If you modify this file, you may extend this exception to your -# version of the file, but you are not obligated to do so. If you do not wish to -# provide this exception without modification, you must delete this exception -# statement from your version and license this file solely under the GPL without -# exception. -# -# -# Copyright (C) 2005 Red Hat, Inc. -# All rights reserved. -# END COPYRIGHT BLOCK -# -# nmake Makefile for passhook.dll -# -!IF "$(CFG)" == "" -CFG=passhook - Win32 Debug -!MESSAGE No configuration specified. Defaulting to passhook - Win32 Debug. -!ENDIF - -!IF "$(CFG)" != "passhook - Win32 Release" && "$(CFG)" != "passhook - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "passhook.mak" CFG="passhook - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "passhook - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "passhook - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "passhook - Win32 Release" - -OUTDIR=$(OBJDEST)\passhook -INTDIR=$(OBJDEST)\passhook -# Begin Custom Macros -OutDir=$(OBJDEST)\passhook -# End Custom Macros - -ALL : "$(OUTDIR)\passhook.dll" - - -CLEAN : - -@erase "$(INTDIR)\passhand.obj" - -@erase "$(INTDIR)\passhook.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(OUTDIR)\passhook.dll" - -@erase "$(OUTDIR)\passhook.exp" - -@erase "$(OUTDIR)\passhook.lib" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PASSHOOK_EXPORTS" /Fp"$(INTDIR)\passhook.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\passhook.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\passhook.pdb" /machine:I386 /def:".\passhook.def" /out:"$(OUTDIR)\passhook.dll" /implib:"$(OUTDIR)\passhook.lib" -DEF_FILE= \ - ".\passhook.def" -LINK32_OBJS= \ - "$(INTDIR)\passhand.obj" \ - "$(INTDIR)\passhook.obj" - -"$(OUTDIR)\passhook.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "passhook - Win32 Debug" - -OUTDIR=$(OBJDEST)\passhook -INTDIR=$(OBJDEST)\passhook -# Begin Custom Macros -OutDir=$(OBJDEST)\passhook -# End Custom Macros - -ALL : "$(OUTDIR)\passhook.dll" - - -CLEAN : - -@erase "$(INTDIR)\passhand.obj" - -@erase "$(INTDIR)\passhook.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\passhook.dll" - -@erase "$(OUTDIR)\passhook.exp" - -@erase "$(OUTDIR)\passhook.ilk" - -@erase "$(OUTDIR)\passhook.lib" - -@erase "$(OUTDIR)\passhook.pdb" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PASSHOOK_EXPORTS" /Fp"$(INTDIR)\passhook.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\passhook.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=nss3.lib libnspr4.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\passhook.pdb" /debug /machine:I386 /def:".\passhook.def" /out:"$(OUTDIR)\passhook.dll" /implib:"$(OUTDIR)\passhook.lib" -DEF_FILE= \ - ".\passhook.def" -LINK32_OBJS= \ - "$(INTDIR)\passhand.obj" \ - "$(INTDIR)\passhook.obj" - -"$(OUTDIR)\passhook.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("passhook.dep") -!INCLUDE "passhook.dep" -!ELSE -!MESSAGE Warning: cannot find "passhook.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "passhook - Win32 Release" || "$(CFG)" == "passhook - Win32 Debug" -SOURCE=..\passhand.cpp - -"$(INTDIR)\passhand.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -SOURCE=.\passhook.cpp - -"$(INTDIR)\passhook.obj" : $(SOURCE) "$(INTDIR)" - - - -!ENDIF - +# +# BEGIN COPYRIGHT BLOCK +# This Program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation; version 2 of the License. +# +# This Program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple +# Place, Suite 330, Boston, MA 02111-1307 USA. +# +# In addition, as a special exception, Red Hat, Inc. gives You the additional +# right to link the code of this Program with code not covered under the GNU +# General Public License ("Non-GPL Code") and to distribute linked combinations +# including the two, subject to the limitations in this paragraph. Non-GPL Code +# permitted under this exception must only link to the code of this Program +# through those well defined interfaces identified in the file named EXCEPTION +# found in the source code files (the "Approved Interfaces"). The files of +# Non-GPL Code may instantiate templates or use macros or inline functions from +# the Approved Interfaces without causing the resulting work to be covered by +# the GNU General Public License. Only Red Hat, Inc. may make changes or +# additions to the list of Approved Interfaces. You must obey the GNU General +# Public License in all respects for all of the Program code and other code used +# in conjunction with the Program except the Non-GPL Code covered by this +# exception. If you modify this file, you may extend this exception to your +# version of the file, but you are not obligated to do so. If you do not wish to +# provide this exception without modification, you must delete this exception +# statement from your version and license this file solely under the GPL without +# exception. +# +# +# Copyright (C) 2005 Red Hat, Inc. +# All rights reserved. +# END COPYRIGHT BLOCK +# +# nmake Makefile for passhook.dll +# +!IF "$(CFG)" == "" +CFG=passhook - Win32 Debug +!MESSAGE No configuration specified. Defaulting to passhook - Win32 Debug. +!ENDIF + +!IF "$(CFG)" != "passhook - Win32 Release" && "$(CFG)" != "passhook - Win32 Debug" +!MESSAGE Invalid configuration "$(CFG)" specified. +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "passhook.mak" CFG="passhook - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "passhook - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "passhook - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE +!ERROR An invalid configuration is specified. +!ENDIF + +!IF "$(OS)" == "Windows_NT" +NULL= +!ELSE +NULL=nul +!ENDIF + +!IF "$(CFG)" == "passhook - Win32 Release" + +OUTDIR=$(OBJDEST)\passhook +INTDIR=$(OBJDEST)\passhook +# Begin Custom Macros +OutDir=$(OBJDEST)\passhook +# End Custom Macros + +ALL : "$(OUTDIR)\passhook.dll" + + +CLEAN : + -@erase "$(INTDIR)\passhand.obj" + -@erase "$(INTDIR)\passhook.obj" + -@erase "$(INTDIR)\vc60.idb" + -@erase "$(OUTDIR)\passhook.dll" + -@erase "$(OUTDIR)\passhook.exp" + -@erase "$(OUTDIR)\passhook.lib" + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +CPP=cl.exe +CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PASSHOOK_EXPORTS" /Fp"$(INTDIR)\passhook.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c + +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +MTL=midl.exe +MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\passhook.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\passhook.pdb" /machine:I386 /def:".\passhook.def" /out:"$(OUTDIR)\passhook.dll" /implib:"$(OUTDIR)\passhook.lib" +DEF_FILE= \ + ".\passhook.def" +LINK32_OBJS= \ + "$(INTDIR)\passhand.obj" \ + "$(INTDIR)\passhook.obj" + +"$(OUTDIR)\passhook.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ELSEIF "$(CFG)" == "passhook - Win32 Debug" + +OUTDIR=$(OBJDEST)\passhook +INTDIR=$(OBJDEST)\passhook +# Begin Custom Macros +OutDir=$(OBJDEST)\passhook +# End Custom Macros + +ALL : "$(OUTDIR)\passhook.dll" + + +CLEAN : + -@erase "$(INTDIR)\passhand.obj" + -@erase "$(INTDIR)\passhook.obj" + -@erase "$(INTDIR)\vc60.idb" + -@erase "$(INTDIR)\vc60.pdb" + -@erase "$(OUTDIR)\passhook.dll" + -@erase "$(OUTDIR)\passhook.exp" + -@erase "$(OUTDIR)\passhook.ilk" + -@erase "$(OUTDIR)\passhook.lib" + -@erase "$(OUTDIR)\passhook.pdb" + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +CPP=cl.exe +CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PASSHOOK_EXPORTS" /Fp"$(INTDIR)\passhook.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c + +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\passhook.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=nss3.lib libnspr4.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\passhook.pdb" /debug /machine:I386 /def:".\passhook.def" /out:"$(OUTDIR)\passhook.dll" /implib:"$(OUTDIR)\passhook.lib" +DEF_FILE= \ + ".\passhook.def" +LINK32_OBJS= \ + "$(INTDIR)\passhand.obj" \ + "$(INTDIR)\passhook.obj" + +"$(OUTDIR)\passhook.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + + +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("passhook.dep") +!INCLUDE "passhook.dep" +!ELSE +!MESSAGE Warning: cannot find "passhook.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "passhook - Win32 Release" || "$(CFG)" == "passhook - Win32 Debug" +SOURCE=..\passhand.cpp + +"$(INTDIR)\passhand.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\passhook.cpp + +"$(INTDIR)\passhook.obj" : $(SOURCE) "$(INTDIR)" + + + +!ENDIF +

18 years, 5 months

1
0
0 / 0

[Fedora-directory-commits] winsync/passwordsync package.mak, 1.2, 1.3

by Doctor Conrad

Author: nkinder Update of /cvs/dirsec/winsync/passwordsync In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18135/passwordsync Modified Files: package.mak Log Message: Remove carriage returns from nmake makefiles Index: package.mak =================================================================== RCS file: /cvs/dirsec/winsync/passwordsync/package.mak,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- package.mak 10 Nov 2005 00:36:40 -0000 1.2 +++ package.mak 10 Nov 2005 04:17:59 -0000 1.3 @@ -1,65 +1,65 @@ -# -# BEGIN COPYRIGHT BLOCK -# This Program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; version 2 of the License. -# -# This Program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA. -# -# In addition, as a special exception, Red Hat, Inc. gives You the additional -# right to link the code of this Program with code not covered under the GNU -# General Public License ("Non-GPL Code") and to distribute linked combinations -# including the two, subject to the limitations in this paragraph. Non-GPL Code -# permitted under this exception must only link to the code of this Program -# through those well defined interfaces identified in the file named EXCEPTION -# found in the source code files (the "Approved Interfaces"). The files of -# Non-GPL Code may instantiate templates or use macros or inline functions from -# the Approved Interfaces without causing the resulting work to be covered by -# the GNU General Public License. Only Red Hat, Inc. may make changes or -# additions to the list of Approved Interfaces. You must obey the GNU General -# Public License in all respects for all of the Program code and other code used -# in conjunction with the Program except the Non-GPL Code covered by this -# exception. If you modify this file, you may extend this exception to your -# version of the file, but you are not obligated to do so. If you do not wish to -# provide this exception without modification, you must delete this exception -# statement from your version and license this file solely under the GPL without -# exception. -# -# -# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. -# Copyright (C) 2005 Red Hat, Inc. -# All rights reserved. -# END COPYRIGHT BLOCK -# -# Packaging nmake Makefile for PassSync.msi - -ALL : PassSync.msi - -LAYOUT : - copy /Y "$(OBJDEST)\passsync\passsync.exe" "$(PKGDIR)" - copy /Y "$(OBJDEST)\passhook\passhook.dll" "$(PKGDIR)" - copy /Y "$(LIBROOT)\ldapsdk\lib\nsldap32v50.dll" "$(PKGDIR)" - copy /Y "$(LIBROOT)\ldapsdk\lib\nsldapssl32v50.dll" "$(PKGDIR)" - copy /Y "$(LIBROOT)\ldapsdk\lib\nsldappr32v50.dll" "$(PKGDIR)" - copy /Y "$(LIBROOT)\nspr\lib\libnspr4.dll" "$(PKGDIR)" - copy /Y "$(LIBROOT)\nspr\lib\libplds4.dll" "$(PKGDIR)" - copy /Y "$(LIBROOT)\nspr\lib\libplc4.dll" "$(PKGDIR)" - copy /Y "$(LIBROOT)\nss\lib\nss3.dll" "$(PKGDIR)" - copy /Y "$(LIBROOT)\nss\lib\ssl3.dll" "$(PKGDIR)" - copy /Y "$(LIBROOT)\nss\lib\softokn3.dll" "$(PKGDIR)" - copy /Y "$(LIBROOT)\nss\lib\smime3.dll" "$(PKGDIR)" - copy /Y "$(LIBROOT)\nss\bin\certutil.exe" "$(PKGDIR)" - copy /Y "$(LIBROOT)\nss\bin\pk12util.exe" "$(PKGDIR)" - -PassSync.msi : LAYOUT - mkdir "$(PKGDIR)\Binary" - copy /Y wix\Binary "$(PKGDIR)\Binary" - cd "$(PKGDIR)" - candle "$(WXSDIR)\PassSync.wxs" - light PassSync.wixobj +# +# BEGIN COPYRIGHT BLOCK +# This Program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation; version 2 of the License. +# +# This Program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple +# Place, Suite 330, Boston, MA 02111-1307 USA. +# +# In addition, as a special exception, Red Hat, Inc. gives You the additional +# right to link the code of this Program with code not covered under the GNU +# General Public License ("Non-GPL Code") and to distribute linked combinations +# including the two, subject to the limitations in this paragraph. Non-GPL Code +# permitted under this exception must only link to the code of this Program +# through those well defined interfaces identified in the file named EXCEPTION +# found in the source code files (the "Approved Interfaces"). The files of +# Non-GPL Code may instantiate templates or use macros or inline functions from +# the Approved Interfaces without causing the resulting work to be covered by +# the GNU General Public License. Only Red Hat, Inc. may make changes or +# additions to the list of Approved Interfaces. You must obey the GNU General +# Public License in all respects for all of the Program code and other code used +# in conjunction with the Program except the Non-GPL Code covered by this +# exception. If you modify this file, you may extend this exception to your +# version of the file, but you are not obligated to do so. If you do not wish to +# provide this exception without modification, you must delete this exception +# statement from your version and license this file solely under the GPL without +# exception. +# +# +# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. +# Copyright (C) 2005 Red Hat, Inc. +# All rights reserved. +# END COPYRIGHT BLOCK +# +# Packaging nmake Makefile for PassSync.msi + +ALL : PassSync.msi + +LAYOUT : + copy /Y "$(OBJDEST)\passsync\passsync.exe" "$(PKGDIR)" + copy /Y "$(OBJDEST)\passhook\passhook.dll" "$(PKGDIR)" + copy /Y "$(LIBROOT)\ldapsdk\lib\nsldap32v50.dll" "$(PKGDIR)" + copy /Y "$(LIBROOT)\ldapsdk\lib\nsldapssl32v50.dll" "$(PKGDIR)" + copy /Y "$(LIBROOT)\ldapsdk\lib\nsldappr32v50.dll" "$(PKGDIR)" + copy /Y "$(LIBROOT)\nspr\lib\libnspr4.dll" "$(PKGDIR)" + copy /Y "$(LIBROOT)\nspr\lib\libplds4.dll" "$(PKGDIR)" + copy /Y "$(LIBROOT)\nspr\lib\libplc4.dll" "$(PKGDIR)" + copy /Y "$(LIBROOT)\nss\lib\nss3.dll" "$(PKGDIR)" + copy /Y "$(LIBROOT)\nss\lib\ssl3.dll" "$(PKGDIR)" + copy /Y "$(LIBROOT)\nss\lib\softokn3.dll" "$(PKGDIR)" + copy /Y "$(LIBROOT)\nss\lib\smime3.dll" "$(PKGDIR)" + copy /Y "$(LIBROOT)\nss\bin\certutil.exe" "$(PKGDIR)" + copy /Y "$(LIBROOT)\nss\bin\pk12util.exe" "$(PKGDIR)" + +PassSync.msi : LAYOUT + mkdir "$(PKGDIR)\Binary" + copy /Y wix\Binary "$(PKGDIR)\Binary" + cd "$(PKGDIR)" + candle "$(WXSDIR)\PassSync.wxs" + light PassSync.wixobj

18 years, 5 months

1
0
0 / 0

[Fedora-directory-commits] winsync winsync.mak,1.2,1.3

by Doctor Conrad

Author: nkinder Update of /cvs/dirsec/winsync In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18135 Modified Files: winsync.mak Log Message: Remove carriage returns from nmake makefiles Index: winsync.mak =================================================================== RCS file: /cvs/dirsec/winsync/winsync.mak,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- winsync.mak 10 Nov 2005 00:36:34 -0000 1.2 +++ winsync.mak 10 Nov 2005 04:17:52 -0000 1.3 @@ -1,59 +1,59 @@ -# -# BEGIN COPYRIGHT BLOCK -# This Program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; version 2 of the License. -# -# This Program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA. -# -# In addition, as a special exception, Red Hat, Inc. gives You the additional -# right to link the code of this Program with code not covered under the GNU -# General Public License ("Non-GPL Code") and to distribute linked combinations -# including the two, subject to the limitations in this paragraph. Non-GPL Code -# permitted under this exception must only link to the code of this Program -# through those well defined interfaces identified in the file named EXCEPTION -# found in the source code files (the "Approved Interfaces"). The files of -# Non-GPL Code may instantiate templates or use macros or inline functions from -# the Approved Interfaces without causing the resulting work to be covered by -# the GNU General Public License. Only Red Hat, Inc. may make changes or -# additions to the list of Approved Interfaces. You must obey the GNU General -# Public License in all respects for all of the Program code and other code used -# in conjunction with the Program except the Non-GPL Code covered by this -# exception. If you modify this file, you may extend this exception to your -# version of the file, but you are not obligated to do so. If you do not wish to -# provide this exception without modification, you must delete this exception -# statement from your version and license this file solely under the GPL without -# exception. -# -# -# Copyright (C) 2005 Red Hat, Inc. -# All rights reserved. -# END COPYRIGHT BLOCK -# -# nmake Makefile for Windows Sync components -# - -ALL : PASSSYNC NTDS - -CLEAN_ALL : CLEAN - if exist components rmdir /S/Q components - -CLEAN : - if exist built rmdir /S/Q built - if exist dist rmdir /S/Q dist - -PASSSYNC : - cd passwordsync - build.bat - cd .. - -NTDS : - cd usersync - build.bat - cd .. +# +# BEGIN COPYRIGHT BLOCK +# This Program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation; version 2 of the License. +# +# This Program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple +# Place, Suite 330, Boston, MA 02111-1307 USA. +# +# In addition, as a special exception, Red Hat, Inc. gives You the additional +# right to link the code of this Program with code not covered under the GNU +# General Public License ("Non-GPL Code") and to distribute linked combinations +# including the two, subject to the limitations in this paragraph. Non-GPL Code +# permitted under this exception must only link to the code of this Program +# through those well defined interfaces identified in the file named EXCEPTION +# found in the source code files (the "Approved Interfaces"). The files of +# Non-GPL Code may instantiate templates or use macros or inline functions from +# the Approved Interfaces without causing the resulting work to be covered by +# the GNU General Public License. Only Red Hat, Inc. may make changes or +# additions to the list of Approved Interfaces. You must obey the GNU General +# Public License in all respects for all of the Program code and other code used +# in conjunction with the Program except the Non-GPL Code covered by this +# exception. If you modify this file, you may extend this exception to your +# version of the file, but you are not obligated to do so. If you do not wish to +# provide this exception without modification, you must delete this exception +# statement from your version and license this file solely under the GPL without +# exception. +# +# +# Copyright (C) 2005 Red Hat, Inc. +# All rights reserved. +# END COPYRIGHT BLOCK +# +# nmake Makefile for Windows Sync components +# + +ALL : PASSSYNC NTDS + +CLEAN_ALL : CLEAN + if exist components rmdir /S/Q components + +CLEAN : + if exist built rmdir /S/Q built + if exist dist rmdir /S/Q dist + +PASSSYNC : + cd passwordsync + build.bat + cd .. + +NTDS : + cd usersync + build.bat + cd ..

18 years, 5 months

1
0
0 / 0

[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.40,1.41

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13247/ldapserver/ldap/cm Modified Files: Makefile Log Message: Bug(s) fixed: 172818 Bug Description: Allow ldapserver rpm to be made externally Reviewed by: Noriko (Thanks!) Fix Description: Just use a simple sed command to replace the tokens in the spec.tmpl file. Just assume Fedora branding for this. For some reason, on FC4, the setup -b step does not work unless I added a second echo yes to the command. The tar command used by the rpmbuild step must have all of the command line arguments before the directory to tar. I moved some things around to make the rpm build process more dsbuild friendly. Platforms tested: FC4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- Makefile 31 Oct 2005 15:55:29 -0000 1.40 +++ Makefile 10 Nov 2005 01:35:50 -0000 1.41 @@ -712,10 +712,12 @@ startdir=`pwd` ; cd $(BUILD_ROOT) ; builddir=`pwd` ; \ cd $$startdir ; cd $(INSTDIR)/.. ; \ if [ ! -f $(RPM_FILE_BASE).tar.gz ] ; then \ - if [ ! -f $(RPM_FILE_BASE) ] ; then \ + if [ ! -d $(RPM_FILE_BASE) -a ! -f $(RPM_FILE_BASE) ] ; then \ ln -s $$builddir $(RPM_FILE_BASE) ; \ - fi ; tar cfh - --exclude \*/built --exclude \*/CVS $(RPM_FILE_BASE) --exclude \*/branding --exclude \*/RHEL* | gzip > $(RPM_FILE_BASE).tar.gz ; \ - rm $(RPM_FILE_BASE) ; \ + fi ; tar cfh - --exclude \*/built --exclude \*/CVS --exclude \*/branding --exclude \*/RHEL* $(RPM_FILE_BASE) | gzip > $(RPM_FILE_BASE).tar.gz ; \ + if [ -h $(RPM_FILE_BASE) ] ; then \ + rm $(RPM_FILE_BASE) ; \ + fi ; \ fi # execute the RPM build rpmbuild $(RPM_TOPDIR) $(RPM_SOURCEDIR) $(RPM_BUILDDIR) $(RPM_RPMDIR) $(RPM_SRPMDIR) $(RPM_REQUIRES) --define "flavor $(RPM_FLAVOR)" --clean --nodeps -ba $(OBJDIR)/$(RPM_BASE_NAME)-ds.spec

18 years, 5 months

1
0
0 / 0

[Fedora-directory-commits] ldapserver Makefile, 1.27, 1.28 ldapserver.spec.tmpl, 1.15, 1.16

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13247/ldapserver Modified Files: Makefile ldapserver.spec.tmpl Log Message: Bug(s) fixed: 172818 Bug Description: Allow ldapserver rpm to be made externally Reviewed by: Noriko (Thanks!) Fix Description: Just use a simple sed command to replace the tokens in the spec.tmpl file. Just assume Fedora branding for this. For some reason, on FC4, the setup -b step does not work unless I added a second echo yes to the command. The tar command used by the rpmbuild step must have all of the command line arguments before the directory to tar. I moved some things around to make the rpm build process more dsbuild friendly. Platforms tested: FC4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- Makefile 29 Oct 2005 02:25:50 -0000 1.27 +++ Makefile 10 Nov 2005 01:35:45 -0000 1.28 @@ -346,7 +346,18 @@ $(RELTOOLSPATH)/brandver.pl -i branding/rhds/brandver.dat $@ mv $@ $(OBJDIR) +ifdef INTERNAL_BUILD fedora-ds.spec: ldapserver.spec.tmpl branding/fedora/brandver.dat $(RELTOOLSPATH)/brandver.pl sed -e s/@PLATFORM@/$(BUILD_ARCH)/g ldapserver.spec.tmpl > $@ $(RELTOOLSPATH)/brandver.pl -i branding/fedora/brandver.dat $@ mv $@ $(OBJDIR) +else +fedora-ds.spec: ldapserver.spec.tmpl + sed -e s/@PLATFORM@/$(BUILD_ARCH)/g \ + -e 's/@COMPANY-PRODUCT-NAME@/Fedora Directory Server/g' \ + -e 's/@LCASE-COMPANY-NAME-NOSP@/fedora/g' \ + -e 's/@GEN-VERSION(a)/1.0/g' \ + -e 's+@COMPANY-URL@+http://directory.fedora.redhat.com/+g' \ + ldapserver.spec.tmpl > $@ + mv $@ $(OBJDIR) +endif # INTERNAL_BUILD Index: ldapserver.spec.tmpl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ldapserver.spec.tmpl 9 Nov 2005 21:10:44 -0000 1.15 +++ ldapserver.spec.tmpl 10 Nov 2005 01:35:45 -0000 1.16 @@ -76,7 +76,8 @@ # all we do here is run setup -b to unpack the binaries # into the BuildRoot # the echo yes is for dsktune to continue -echo yes | ./setup -b $RPM_BUILD_ROOT/%{prefix} +# the second echo yes is for some platforms that need it +(echo yes ; echo yes) | ./setup -b $RPM_BUILD_ROOT/%{prefix} %clean if [ -z "$RPM_INSTALL_PREFIX" ]; then

18 years, 5 months

1
0
0 / 0

[Fedora-directory-commits] adminserver/admserv/newinst/src ux-update.cc, 1.13, 1.14

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/newinst/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13048/adminserver/admserv/newinst/src Modified Files: ux-update.cc Log Message: Bug(s) fixed: 172816 Bug Description: use system perl for AS PERL5; make files owned by AS uid Reviewed by: Noriko (Thanks!) Fix Description: 1) I made a similar fix to adminutil to use the system perl for the PERL5 macro on all Linux systems. 2) The files admpw, adm.conf, and console.conf are read and/or written by the httpd process, which is owned by the SSuser (default nobody), so they must be owned by that user. Platforms tested: FC4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: ux-update.cc =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ux-update.cc,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ux-update.cc 28 Oct 2005 22:44:18 -0000 1.13 +++ ux-update.cc 10 Nov 2005 01:12:59 -0000 1.14 @@ -441,6 +441,24 @@ } void +chown_file(const char *user, const char *group, const char *file) +{ + /* only do this if we are root */ + uid_t my_uid = geteuid(); + + if (my_uid == 0) { + char tmp[BIG_BUF]; + + snprintf(tmp, sizeof(tmp), CHOWN_CMD, user, file); + tmp[sizeof(tmp)-1] = 0; + system(tmp); + snprintf(tmp, sizeof(tmp), CHGRP_CMD, group, file); + tmp[sizeof(tmp)-1] = 0; + system(tmp); + } +} + +void create_admserv(char *hn, const char *sroot) { char httpuser[SML_BUF], httppw[SML_BUF]; @@ -599,7 +617,7 @@ fprintf(f, "%s:{SHA}%s", httpuser, pw); fclose(f); chmod(tstr, S_IRUSR | S_IWUSR); - + chown_file(SSuser, SSgroup, tstr); logUninstallInfo(sroot, "admin", "admin", tstr); /* create admin-serv/modules directory */ @@ -1032,7 +1050,7 @@ admConf.setFormat(2); admConf.write(tstr); chmod(tstr, S_IRUSR | S_IWUSR); - + chown_file(SSuser, SSgroup, tstr); logUninstallInfo(sroot, "admin", "admin", tstr); // Mark to remove the following guys which are @@ -1127,6 +1145,7 @@ snprintf(src, sizeof(tstr), "%s/shared/config/template/console.conf.tmpl", sroot); replaceTokensInFile(src, tstr, consolearray); chmod(tstr, S_IRUSR | S_IWUSR); + chown_file(SSuser, SSgroup, tstr); logUninstallInfo(sroot, "admin", "admin", tstr); snprintf(tstr, sizeof(tstr), "%s/start-admin", sroot);

18 years, 5 months

1
0
0 / 0

[Fedora-directory-commits] adminserver nsperl.mk,1.4,1.5

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13048/adminserver Modified Files: nsperl.mk Log Message: Bug(s) fixed: 172816 Bug Description: use system perl for AS PERL5; make files owned by AS uid Reviewed by: Noriko (Thanks!) Fix Description: 1) I made a similar fix to adminutil to use the system perl for the PERL5 macro on all Linux systems. 2) The files admpw, adm.conf, and console.conf are read and/or written by the httpd process, which is owned by the SSuser (default nobody), so they must be owned by that user. Platforms tested: FC4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: nsperl.mk =================================================================== RCS file: /cvs/dirsec/adminserver/nsperl.mk,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nsperl.mk 18 Aug 2005 18:57:33 -0000 1.4 +++ nsperl.mk 10 Nov 2005 01:12:54 -0000 1.5 @@ -80,18 +80,6 @@ ifeq ($(OSVER), HP-UXB.10.10) PERL5=/u/robobld/nsperl/hpux/nsperl endif -ifeq ($(OSVER), Linux2.1) -PERL5=/usr/bin/perl -endif -ifeq ($(OSVER), Linux2.2) -PERL5=/usr/bin/perl -endif -ifeq ($(OSVER), Linux2.4) -PERL5=/usr/bin/perl -endif -ifeq ($(OSVER), RHEL3) -PERL5=/usr/bin/perl -endif -ifeq ($(OSVER), RHEL4) -PERL5=/usr/bin/perl +ifeq ($(BUILD_ARCH), Linux) +PERL5=perl endif

18 years, 5 months

1
0
0 / 0

[Fedora-directory-commits] winsync/usersync/netman netman.mak, 1.1, 1.2

by Doctor Conrad

Author: nkinder Update of /cvs/dirsec/winsync/usersync/netman In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11302/usersync/netman Modified Files: netman.mak Log Message: Changed unix style line endings to DOS style for nmake makefiles Index: netman.mak =================================================================== RCS file: /cvs/dirsec/winsync/usersync/netman/netman.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- netman.mak 10 Nov 2005 00:05:20 -0000 1.1 +++ netman.mak 10 Nov 2005 00:37:02 -0000 1.2 @@ -1,249 +1,249 @@ -# -# BEGIN COPYRIGHT BLOCK -# This Program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; version 2 of the License. -# -# This Program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA. -# -# In addition, as a special exception, Red Hat, Inc. gives You the additional -# right to link the code of this Program with code not covered under the GNU -# General Public License ("Non-GPL Code") and to distribute linked combinations -# including the two, subject to the limitations in this paragraph. Non-GPL Code -# permitted under this exception must only link to the code of this Program -# through those well defined interfaces identified in the file named EXCEPTION -# found in the source code files (the "Approved Interfaces"). The files of -# Non-GPL Code may instantiate templates or use macros or inline functions from -# the Approved Interfaces without causing the resulting work to be covered by -# the GNU General Public License. Only Red Hat, Inc. may make changes or -# additions to the list of Approved Interfaces. You must obey the GNU General -# Public License in all respects for all of the Program code and other code used -# in conjunction with the Program except the Non-GPL Code covered by this -# exception. If you modify this file, you may extend this exception to your -# version of the file, but you are not obligated to do so. If you do not wish to -# provide this exception without modification, you must delete this exception -# statement from your version and license this file solely under the GPL without -# exception. -# -# -# Copyright (C) 2005 Red Hat, Inc. -# All rights reserved. -# END COPYRIGHT BLOCK -# -# nmake Makefile for jnetman.dll and jnetman.jar -# -!IF "$(CFG)" == "" -CFG=netman - Win32 Debug -!MESSAGE No configuration specified. Defaulting to netman - Win32 Debug. -!ENDIF - -!IF "$(CFG)" != "netman - Win32 Release" && "$(CFG)" != "netman - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "netman.mak" CFG="netman - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "netman - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "netman - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -!IF "$(CFG)" == "netman - Win32 Release" - -OUTDIR=$(OBJDEST)\netman -INTDIR=$(OBJDEST)\netman -# Begin Custom Macros -OutDir=$(OBJDEST)\netman -# End Custom Macros - -ALL : "$(OUTDIR)\jnetman_wrap.cxx" "$(OUTDIR)\jnetman.dll" "$(OUTDIR)\jnetman.jar" - - -CLEAN : - -@erase "$(INTDIR)\jnetman_wrap.cxx " - -@erase "$(INTDIR)\jnetman.dll" - -@erase "$(INTDIR)\jnetman.lib" - -@erase "$(INTDIR)\*.obj" - -@erase "$(INTDIR)\*.java" - -@erase "$(INTDIR)\jnetman.jar" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\netman.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\netman.bsc" -BSC32_SBRS= \ - -SWIG=swig.exe -SWIG_OPTS=-v -outdir "$(OUTDIR)" - -LINK32=link.exe -LINK32_LIBS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib netapi32.lib -LINK32_FLAGS=/nologo /DLL /SUBSYSTEM:WINDOWS /pdb:"$(OUTDIR)\jnetman.pdb" /out:"$(OUTDIR)\jnetman.dll" -LINK32_OBJS= \ - "$(INTDIR)\netman.obj" \ - "$(INTDIR)\jnetman_wrap.obj" - -"$(OUTDIR)\jnetman_wrap.cxx" : "$(OUTDIR)" - $(SWIG) $(SWIG_OPTS) -java -package org.bpi.jnetman -c++ jnetman.i - move jnetman_wrap.cxx $(OUTDIR) - -"$(OUTDIR)\jnetman.dll" : "$(OUTDIR)\netman.obj" "$(OUTDIR)\jnetman_wrap.obj" - $(LINK32) $(LINK32_FLAGS) $(LINK32_LIBS) $(LINK32_OBJS) - -!ELSEIF "$(CFG)" == "netman - Win32 Debug" - -OUTDIR=$(OBJDEST)\netman -INTDIR=$(OBJDEST)\netman -# Begin Custom Macros -OutDir=$(OBJDEST)\netman -# End Custom Macros - -ALL : "$(OUTDIR)\jnetman_wrap.cxx" "$(OUTDIR)\jnetman.dll" "$(OUTDIR)\jnetman.jar" - - -CLEAN : - -@erase "$(INTDIR)\jnetman_wrap.cxx " - -@erase "$(INTDIR)\jnetman.dll" - -@erase "$(INTDIR)\jnetman.lib" - -@erase "$(INTDIR)\*.obj" - -@erase "$(INTDIR)\*.java" - -@erase "$(INTDIR)\jnetman.jar" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP=cl.exe -CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\netman.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\netman.bsc" -BSC32_SBRS= \ - -SWIG=swig.exe -SWIG_OPTS=-v -outdir "$(OUTDIR)" - -LINK32=link.exe -LINK32_LIBS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib netapi32.lib -LINK32_FLAGS=/nologo /DLL /SUBSYSTEM:WINDOWS /pdb:"$(OUTDIR)\jnetman.pdb" /debug /out:"$(OUTDIR)\jnetman.dll" -LINK32_OBJS= \ - "$(INTDIR)\netman.obj" \ - "$(INTDIR)\jnetman_wrap.obj" - -"$(OUTDIR)\jnetman_wrap.cxx" : "$(OUTDIR)" - $(SWIG) $(SWIG_OPTS) -java -package org.bpi.jnetman -c++ jnetman.i - move jnetman_wrap.cxx "$(OUTDIR)" - -"$(OUTDIR)\jnetman.dll" : "$(OUTDIR)\netman.obj" "$(OUTDIR)\jnetman_wrap.obj" - $(LINK32) $(LINK32_FLAGS) $(LINK32_LIBS) $(LINK32_OBJS) - -!ENDIF - - -!IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("netman.dep") -!INCLUDE "netman.dep" -!ELSE -!MESSAGE Warning: cannot find "netman.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "netman - Win32 Release" || "$(CFG)" == "netman - Win32 Debug" - -SOURCE=.\netman.cpp - -"$(INTDIR)\netman.obj" : $(SOURCE) "$(INTDIR)" - - -SOURCE="$(OUTDIR)\jnetman_wrap.cxx" - -"$(INTDIR)\jnetman_wrap.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) /I"$(JAVA_HOME)\include" /I"$(JAVA_HOME)\include\win32" /I. $(SOURCE) - -$(OUTDIR)\jnetman.jar : $(SOURCE) "$(OUTDIR)" - javac -d $(OUTDIR) $(OUTDIR)\*.java - (cd $(OUTDIR) && jar cf $(OUTDIR)\jnetman.jar org) - -!ENDIF +# +# BEGIN COPYRIGHT BLOCK +# This Program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation; version 2 of the License. +# +# This Program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple +# Place, Suite 330, Boston, MA 02111-1307 USA. +# +# In addition, as a special exception, Red Hat, Inc. gives You the additional +# right to link the code of this Program with code not covered under the GNU +# General Public License ("Non-GPL Code") and to distribute linked combinations +# including the two, subject to the limitations in this paragraph. Non-GPL Code +# permitted under this exception must only link to the code of this Program +# through those well defined interfaces identified in the file named EXCEPTION +# found in the source code files (the "Approved Interfaces"). The files of +# Non-GPL Code may instantiate templates or use macros or inline functions from +# the Approved Interfaces without causing the resulting work to be covered by +# the GNU General Public License. Only Red Hat, Inc. may make changes or +# additions to the list of Approved Interfaces. You must obey the GNU General +# Public License in all respects for all of the Program code and other code used +# in conjunction with the Program except the Non-GPL Code covered by this +# exception. If you modify this file, you may extend this exception to your +# version of the file, but you are not obligated to do so. If you do not wish to +# provide this exception without modification, you must delete this exception +# statement from your version and license this file solely under the GPL without +# exception. +# +# +# Copyright (C) 2005 Red Hat, Inc. +# All rights reserved. +# END COPYRIGHT BLOCK +# +# nmake Makefile for jnetman.dll and jnetman.jar +# +!IF "$(CFG)" == "" +CFG=netman - Win32 Debug +!MESSAGE No configuration specified. Defaulting to netman - Win32 Debug. +!ENDIF + +!IF "$(CFG)" != "netman - Win32 Release" && "$(CFG)" != "netman - Win32 Debug" +!MESSAGE Invalid configuration "$(CFG)" specified. +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "netman.mak" CFG="netman - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "netman - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "netman - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE +!ERROR An invalid configuration is specified. +!ENDIF + +!IF "$(OS)" == "Windows_NT" +NULL= +!ELSE +NULL=nul +!ENDIF + +!IF "$(CFG)" == "netman - Win32 Release" + +OUTDIR=$(OBJDEST)\netman +INTDIR=$(OBJDEST)\netman +# Begin Custom Macros +OutDir=$(OBJDEST)\netman +# End Custom Macros + +ALL : "$(OUTDIR)\jnetman_wrap.cxx" "$(OUTDIR)\jnetman.dll" "$(OUTDIR)\jnetman.jar" + + +CLEAN : + -@erase "$(INTDIR)\jnetman_wrap.cxx " + -@erase "$(INTDIR)\jnetman.dll" + -@erase "$(INTDIR)\jnetman.lib" + -@erase "$(INTDIR)\*.obj" + -@erase "$(INTDIR)\*.java" + -@erase "$(INTDIR)\jnetman.jar" + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +CPP=cl.exe +CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\netman.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c + +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\netman.bsc" +BSC32_SBRS= \ + +SWIG=swig.exe +SWIG_OPTS=-v -outdir "$(OUTDIR)" + +LINK32=link.exe +LINK32_LIBS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib netapi32.lib +LINK32_FLAGS=/nologo /DLL /SUBSYSTEM:WINDOWS /pdb:"$(OUTDIR)\jnetman.pdb" /out:"$(OUTDIR)\jnetman.dll" +LINK32_OBJS= \ + "$(INTDIR)\netman.obj" \ + "$(INTDIR)\jnetman_wrap.obj" + +"$(OUTDIR)\jnetman_wrap.cxx" : "$(OUTDIR)" + $(SWIG) $(SWIG_OPTS) -java -package org.bpi.jnetman -c++ jnetman.i + move jnetman_wrap.cxx $(OUTDIR) + +"$(OUTDIR)\jnetman.dll" : "$(OUTDIR)\netman.obj" "$(OUTDIR)\jnetman_wrap.obj" + $(LINK32) $(LINK32_FLAGS) $(LINK32_LIBS) $(LINK32_OBJS) + +!ELSEIF "$(CFG)" == "netman - Win32 Debug" + +OUTDIR=$(OBJDEST)\netman +INTDIR=$(OBJDEST)\netman +# Begin Custom Macros +OutDir=$(OBJDEST)\netman +# End Custom Macros + +ALL : "$(OUTDIR)\jnetman_wrap.cxx" "$(OUTDIR)\jnetman.dll" "$(OUTDIR)\jnetman.jar" + + +CLEAN : + -@erase "$(INTDIR)\jnetman_wrap.cxx " + -@erase "$(INTDIR)\jnetman.dll" + -@erase "$(INTDIR)\jnetman.lib" + -@erase "$(INTDIR)\*.obj" + -@erase "$(INTDIR)\*.java" + -@erase "$(INTDIR)\jnetman.jar" + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +CPP=cl.exe +CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\netman.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c + +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\netman.bsc" +BSC32_SBRS= \ + +SWIG=swig.exe +SWIG_OPTS=-v -outdir "$(OUTDIR)" + +LINK32=link.exe +LINK32_LIBS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib netapi32.lib +LINK32_FLAGS=/nologo /DLL /SUBSYSTEM:WINDOWS /pdb:"$(OUTDIR)\jnetman.pdb" /debug /out:"$(OUTDIR)\jnetman.dll" +LINK32_OBJS= \ + "$(INTDIR)\netman.obj" \ + "$(INTDIR)\jnetman_wrap.obj" + +"$(OUTDIR)\jnetman_wrap.cxx" : "$(OUTDIR)" + $(SWIG) $(SWIG_OPTS) -java -package org.bpi.jnetman -c++ jnetman.i + move jnetman_wrap.cxx "$(OUTDIR)" + +"$(OUTDIR)\jnetman.dll" : "$(OUTDIR)\netman.obj" "$(OUTDIR)\jnetman_wrap.obj" + $(LINK32) $(LINK32_FLAGS) $(LINK32_LIBS) $(LINK32_OBJS) + +!ENDIF + + +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("netman.dep") +!INCLUDE "netman.dep" +!ELSE +!MESSAGE Warning: cannot find "netman.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "netman - Win32 Release" || "$(CFG)" == "netman - Win32 Debug" + +SOURCE=.\netman.cpp + +"$(INTDIR)\netman.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE="$(OUTDIR)\jnetman_wrap.cxx" + +"$(INTDIR)\jnetman_wrap.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) /I"$(JAVA_HOME)\include" /I"$(JAVA_HOME)\include\win32" /I. $(SOURCE) + +$(OUTDIR)\jnetman.jar : $(SOURCE) "$(OUTDIR)" + javac -d $(OUTDIR) $(OUTDIR)\*.java + (cd $(OUTDIR) && jar cf $(OUTDIR)\jnetman.jar org) + +!ENDIF

18 years, 5 months

1
0
0 / 0

[Fedora-directory-commits] winsync/usersync/apacheds apacheds.mak, 1.1, 1.2

by Doctor Conrad

Author: nkinder Update of /cvs/dirsec/winsync/usersync/apacheds In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11302/usersync/apacheds Modified Files: apacheds.mak Log Message: Changed unix style line endings to DOS style for nmake makefiles Index: apacheds.mak =================================================================== RCS file: /cvs/dirsec/winsync/usersync/apacheds/apacheds.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apacheds.mak 10 Nov 2005 00:04:59 -0000 1.1 +++ apacheds.mak 10 Nov 2005 00:36:56 -0000 1.2 @@ -1,62 +1,62 @@ -# -# BEGIN COPYRIGHT BLOCK -# This Program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; version 2 of the License. -# -# This Program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA. -# -# In addition, as a special exception, Red Hat, Inc. gives You the additional -# right to link the code of this Program with code not covered under the GNU -# General Public License ("Non-GPL Code") and to distribute linked combinations -# including the two, subject to the limitations in this paragraph. Non-GPL Code -# permitted under this exception must only link to the code of this Program -# through those well defined interfaces identified in the file named EXCEPTION -# found in the source code files (the "Approved Interfaces"). The files of -# Non-GPL Code may instantiate templates or use macros or inline functions from -# the Approved Interfaces without causing the resulting work to be covered by -# the GNU General Public License. Only Red Hat, Inc. may make changes or -# additions to the list of Approved Interfaces. You must obey the GNU General -# Public License in all respects for all of the Program code and other code used -# in conjunction with the Program except the Non-GPL Code covered by this -# exception. If you modify this file, you may extend this exception to your -# version of the file, but you are not obligated to do so. If you do not wish to -# provide this exception without modification, you must delete this exception -# statement from your version and license this file solely under the GPL without -# exception. -# -# -# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. -# Copyright (C) 2005 Red Hat, Inc. -# All rights reserved. -# END COPYRIGHT BLOCK -# -# nmake Makefile for usersync.jar -# - -OUTDIR=$(OBJDEST)\apacheds -USERSYNCJAR=$(OUTDIR)\usersync.jar -CLASSPATH=$(APACHEDS_FILE);$(OBJDEST)\netman\jnetman.jar - -ALL : "$(USERSYNCJAR)" - - -$(APACHEDSSOURCE)\core\target : "$(OBJDEST)\netman\jnetman.jar" "$(OUTDIR)" - copy project.properties "$(APACHEDSSOURCE)\core" - copy usersync.schema "$(APACHEDSSOURCE)\core\src\main\schema" - maven -b -d "$(APACHEDSSOURCE)\core" -e directory:schema - javac -classpath "$(CLASSPATH)" $(APACHEDSSOURCE)\core\target\schema\org\apache\ldap\server\schema\bootstrap\*.java - javac -classpath "$(CLASSPATH)" -d "$(APACHEDSSOURCE)\core\target\schema" org\apache\ldap\server\*.java - -$(USERSYNCJAR) : "$(APACHEDSSOURCE)\core\target" - ( cd "$(APACHEDSSOURCE)\core\target\schema" && jar cf usersync.jar org) - move "$(APACHEDSSOURCE)\core\target\schema\usersync.jar" "$(USERSYNCJAR)" - -$(OUTDIR) : - if not exist "$(OUTDIR)" mkdir "$(OUTDIR)" +# +# BEGIN COPYRIGHT BLOCK +# This Program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation; version 2 of the License. +# +# This Program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple +# Place, Suite 330, Boston, MA 02111-1307 USA. +# +# In addition, as a special exception, Red Hat, Inc. gives You the additional +# right to link the code of this Program with code not covered under the GNU +# General Public License ("Non-GPL Code") and to distribute linked combinations +# including the two, subject to the limitations in this paragraph. Non-GPL Code +# permitted under this exception must only link to the code of this Program +# through those well defined interfaces identified in the file named EXCEPTION +# found in the source code files (the "Approved Interfaces"). The files of +# Non-GPL Code may instantiate templates or use macros or inline functions from +# the Approved Interfaces without causing the resulting work to be covered by +# the GNU General Public License. Only Red Hat, Inc. may make changes or +# additions to the list of Approved Interfaces. You must obey the GNU General +# Public License in all respects for all of the Program code and other code used +# in conjunction with the Program except the Non-GPL Code covered by this +# exception. If you modify this file, you may extend this exception to your +# version of the file, but you are not obligated to do so. If you do not wish to +# provide this exception without modification, you must delete this exception +# statement from your version and license this file solely under the GPL without +# exception. +# +# +# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. +# Copyright (C) 2005 Red Hat, Inc. +# All rights reserved. +# END COPYRIGHT BLOCK +# +# nmake Makefile for usersync.jar +# + +OUTDIR=$(OBJDEST)\apacheds +USERSYNCJAR=$(OUTDIR)\usersync.jar +CLASSPATH=$(APACHEDS_FILE);$(OBJDEST)\netman\jnetman.jar + +ALL : "$(USERSYNCJAR)" + + +$(APACHEDSSOURCE)\core\target : "$(OBJDEST)\netman\jnetman.jar" "$(OUTDIR)" + copy project.properties "$(APACHEDSSOURCE)\core" + copy usersync.schema "$(APACHEDSSOURCE)\core\src\main\schema" + maven -b -d "$(APACHEDSSOURCE)\core" -e directory:schema + javac -classpath "$(CLASSPATH)" $(APACHEDSSOURCE)\core\target\schema\org\apache\ldap\server\schema\bootstrap\*.java + javac -classpath "$(CLASSPATH)" -d "$(APACHEDSSOURCE)\core\target\schema" org\apache\ldap\server\*.java + +$(USERSYNCJAR) : "$(APACHEDSSOURCE)\core\target" + ( cd "$(APACHEDSSOURCE)\core\target\schema" && jar cf usersync.jar org) + move "$(APACHEDSSOURCE)\core\target\schema\usersync.jar" "$(USERSYNCJAR)" + +$(OUTDIR) : + if not exist "$(OUTDIR)" mkdir "$(OUTDIR)"

18 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

389-commits November 2005