X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fclam%2Fcpp%2Frules.def;h=292e769f51207b4830907a2852ba50375badb387;hb=da8805bb69afd232991a8031d3164f02e78da644;hp=40a72ba49f22903464a01799b25f2de0a1c3f2d1;hpb=b237ba491962f03bc342fdd4186494c35e29cdea;p=feisty_meow.git

diff --git a/scripts/clam/cpp/rules.def b/scripts/clam/cpp/rules.def
index 40a72ba4..292e769f 100644
--- a/scripts/clam/cpp/rules.def
+++ b/scripts/clam/cpp/rules.def
@@ -5,9 +5,9 @@
 # This file composite macros and rules for creating compilation objects
 # (such as library archives, object files, executable programs, and others).
 
-# This file should be included in the user's Makefile after the variables
+# This file should be included in the user Makefile after the variables
 # have been initialized appropriately for the particular project being
-# compiled.  The user's own targets should be placed after the include
+# compiled.  The user targets should be placed after the include
 # directive that specifies this file.
 
 ###############################################################################
@@ -104,6 +104,10 @@ endif
 ###############################################################################
 
 ifeq "$(COMPILER)" "GNU_DARWIN"
+  # finds the crypto code on macos.
+  HEADER_SEARCH_PATH += /usr/local/opt/openssl/include
+  LIBRARY_SEARCH_PATH += /usr/local/opt/openssl/lib/
+
   ifneq "$(USE_XWIN)" ""
     DEFINITIONS += __XWINDOWS__ __X__
     LIBS_USED += 
@@ -111,11 +115,11 @@ ifeq "$(COMPILER)" "GNU_DARWIN"
 #need to separate out with a USE_MOTIF kind of thing.
 #LIBS_USED += Xmu
     HEADER_SEARCH_PATH += /usr/include/X11 /usr/X11R6/include /usr/include/g++
-    LIBRARY_SEARCH_PATH += /usr/X11R6/lib 
+    LIBRARY_SEARCH_PATH += /usr/X11R6/lib
   endif
 
   ifneq "$(USE_SSL)" ""
-    LIBS_USED += crypto
+    LIBS_USED += crypto ssl
   endif
   
   ifneq "$(USE_WXWIDGETS)" ""
@@ -147,120 +151,6 @@ endif
 
 ###############################################################################
 
-
-# additions for gnu x86 and arm compilers.
-ifneq "$(OP_SYSTEM)" "WIN32"
-  # is the freetds library support available on this host.
-  ifneq "$(ENABLE_FREETDS)" ""
-    # establish the headers if freetds is enabled.  that just means things
-    # can be compiled against it.  to link in the db-lib, the makefile should
-    # have a 'USE_FREETDS = true' statement.
-
-    # is this particular library or app using freetds?
-    ifneq "$(USE_FREETDS)" ""
-      DEFINITIONS += ENABLE_FREETDS _FREETDS_LIBRARY_SOURCE
-      LIBS_USED += rt sybdb 
-    endif
-  endif
-endif
-
-# win32 compiler additions.
-#ifeq "$(OP_SYSTEM)" "WIN32"
-ifeq "$(COMPILER)" "VISUAL_CPP"
-  # processes the def file for linkage, if one has been specified.
-  ifneq "$(DEF_FILE)" ""
-    LOAD_FLAG_PREFIX += -def:$(DEF_FILE)
-  endif
-
-  ifneq "$(TYPE)" "library"
-    ifneq "$(USE_MFC)" ""
-      ifneq "$(findstring UNICODE, $(DEFINITIONS))" "" 
-        # specify the winmain type for unicode explicitly.
-        LOAD_FLAG_PREFIX += -entry:wWinMainCRTStartup
-      endif
-    endif
-  endif
-
-  # these are loaded after any special debugging libs.
-  ifneq "$(VCPP_USE_BASE)" ""
-    # the first set will be included in almost any old program.  we include
-    # winmm for multimedia in the base support since we make heavy use of the
-    # more accurate uptime function.
-    LOAD_FLAG_PREFIX += kernel32.lib user32.lib advapi32.lib shell32.lib \
-      version.lib winmm.lib shlwapi.lib 
-  endif
-
-  ifneq "$(USE_WXWIDGETS)" ""
-    DEFINITIONS += __WXWIDGETS__ __WXMSW__ 
-    LOCAL_HEADERS += $(THIRD_PARTY_DIR)/wxwidgets/include 
-    LIBRARY_SEARCH_PATH += $(THIRD_PARTY_DIR)/wxwidgets/lib
-#    ifeq "$(findstring UNICODE, $(DEFINITIONS))" ""
-      LIBS_USED += wxmsw28_core.lib
-      LOCAL_HEADERS += $(THIRD_PARTY_DIR)/wxwidgets/lib/msw
-#    else
-#      DEFINITIONS += wxUSE_UNICODE
-#      LIBS_USED += wxmsw28u_core.lib
-#      LOCAL_HEADERS += $(THIRD_PARTY_DIR)/wxwidgets/lib/mswu
-#    endif
-
-##    LOAD_FLAG_PREFIX += comctl32.lib shell32.lib
-    VCPP_USE_GUI = t
-    VCPP_USE_OLE = t
-  endif
-
-  ifneq "$(USE_CURL)" ""
-#    # curl wants this win32 flag?
-    DEFINITIONS += WIN32
-    LOCAL_HEADERS += $(THIRD_PARTY_DIR)/curl/include
-    LIBRARY_SEARCH_PATH += $(THIRD_PARTY_DIR)/curl/lib
-#    LIBS_USED += libcurl.dll.a
-    LIBS_USED += libcurl.lib
-  endif
-
-  ifneq "$(VCPP_USE_GUI)" ""
-    LOAD_FLAG_PREFIX += comctl32.lib comdlg32.lib gdi32.lib winspool.lib
-  endif
-
-  ifneq "$(VCPP_USE_OLE)" ""
-    LOAD_FLAG_PREFIX += ole32.lib oleaut32.lib uuid.lib
-    VCPP_USE_RPC = t
-  endif
-  ifneq "$(VCPP_USE_RPC)" ""
-    ifeq "$(COMPILER_VERSION)" "8"
-      LOAD_FLAG_PREFIX += rpcndr.lib rpcns4.lib rpcrt4.lib
-    endif
-    ifeq "$(COMPILER_VERSION)" "10"
-      LOAD_FLAG_PREFIX += rpcrt4.lib
-    endif
-    VCPP_USE_SOCK = t
-  endif
-  ifneq "$(VCPP_USE_SOCK)" ""
-    LOAD_FLAG_PREFIX += netapi32.lib ws2_32.lib
-  endif
-  ifneq "$(VCPP_USE_CLR)" ""
-    LOAD_FLAG_PREFIX += -noentry -include:"__DllMainCRTStartup@12"
-    COMPILER_FLAGS += -EHa -clr -AI "$(FRAMEWORK_DIR)" -AI "$(DYNAMIC_LIBRARY_DIR)" -FU "mscorlib.dll" -FU "System.dll" -FU "System.Data.dll" -FU "System.Windows.Forms.dll" -FU "System.Drawing.dll"
-  endif
-
-  ifneq "$(USE_SSL)" ""
-    LOCAL_HEADERS += $(THIRD_PARTY_DIR)/openssl/include
-    LIBRARY_SEARCH_PATH += $(THIRD_PARTY_DIR)/openssl/lib
-    LIBS_USED += libcrypto.lib libssl.lib
-#no, yuck.    $(shell cp $(THIRD_PARTY_DIR)/openssl/lib/*dll $(EXECUTABLE_DIR) )
-  endif
-  
-endif
-
-#ifeq "$(OP_SYSTEM)" "WIN32"
-ifeq "$(COMPILER)" "VISUAL_CPP"
-  # prep the actual source variable so that certain file names are translated.
-  ACTUAL_RESX = $(RESX:%.resx=$(OBJECT_DIR)/%.resources)
-  ACTUAL_RESX_FLAGS = $(ACTUAL_RESX:%=-ASSEMBLYLINKRESOURCE:%) 
-else
-  ACTUAL_RESX = 
-  ACTUAL_RESX_FLAGS = 
-endif
-
 # Create the real list of local libraries needed.
 TEMP_LOC1 = $(LOCAL_LIBS_USED:%=%$(TRIPART_VERSION))
 ACTUAL_LOCAL_LIBS = $(TEMP_LOC1)
@@ -268,22 +158,10 @@ ACTUAL_LOCAL_LIBS = $(TEMP_LOC1)
 # Create the list of objects from the list of source files.
 TEMP_OBJ1 = $(SOURCE:%.cpp=%.obj)
 TEMP_OBJ2 = $(TEMP_OBJ1:%.c=%.obj)
-ifeq "$(COMPILER)" "VISUAL_CPP"
-  ifneq "$(OMIT_VERSIONS)" ""
-    # remove version rc files if we're not dealing with versions.
-    TEMP_OBJ3a = $(TEMP_OBJ2:%_version.rc=)
-  else
-    TEMP_OBJ3a = $(TEMP_OBJ2)
-  endif
-  ifeq "$(COMPILER)" "VISUAL_CPP"
-    TEMP_OBJ3 = $(TEMP_OBJ3a:%.rc=%.res)
-  else
-    TEMP_OBJ3 = $(TEMP_OBJ3a)
-  endif
-else
-  # replace this when supporting resource files on unix.
-  TEMP_OBJ3 = $(TEMP_OBJ2:%.rc=)
-endif
+
+# replace this when supporting resource files on unix.
+TEMP_OBJ3 = $(TEMP_OBJ2:%.rc=)
+
 TEMP_OBJ4 = $(TEMP_OBJ3:%.h=%.bad)
 OBJECTS = $(TEMP_OBJ4)
 
@@ -330,20 +208,6 @@ EXE_CPPS   = $(EXE_TEMP_3:%.exe=%.cpp)
 # used for compiling multiple source files at the same time with visual cpp.
 MULTI_BUILD_CMD = $(CC) $(COMPILER_FLAGS) -c `cat $(BUILD_LIST_FILE)` $(OBJECT_NAME_FLAG)$(OBJECT_DIR)/
 
-# prepare for mfc style DLLs.  currently we plan on all dlls we create being
-# based on MFC.  this is an unfortunate requirement for using the mfc debug
-# support for allocations; if regular new and DEBUG_NEW get mixed together,
-# crashes used to result.  supposedly these are gone now at least.
-ifneq "$(USE_MFC)" ""
-#  ifeq "$(OP_SYSTEM)" "WIN32"
-  ifeq "$(COMPILER)" "VISUAL_CPP"
-    # set the flag that says we are doing mfc extension dlls.
-    DEFINITIONS += _AFXDLL
-    DEPENDENCY_DEFINITIONS += _MT _DLL
-    DEPENDENCY_DEFINITIONS += __AFXWIN_H__  # add this flag to shut stdafx up.
-  endif
-endif
-
 ifeq "$(OMIT_VERSIONS)" ""
   ifneq "$(VERSION_RC_ROOT)" ""
     VERSION_TARGET = $(VERSION_RC_ROOT)_version.rc
@@ -372,13 +236,13 @@ ACTUAL_FIRST_TARGETS = check_requirements $(EXTRA_FIRST_TARGETS) $(VERSION_TARGE
 # Adds the primary targets to the list of products to create.
 #ifeq "$(NO_COMPILE)" ""
 
-  ifneq "$(COMPILER)" "VISUAL_CPP"
+  ifneq "$(OP_SYSTEM)" "WIN32"
     ACTUAL_TARGETS1 = $(TARGETS:%.exe=$(EXECUTABLE_DIR)/%)
   else
     ACTUAL_TARGETS1 = $(TARGETS:%.exe=$(EXECUTABLE_DIR)/%.exe)
   endif
 
-  ifneq "$(COMPILER)" "VISUAL_CPP"
+  ifneq "$(OP_SYSTEM)" "WIN32"
     ACTUAL_TARGETS2 = $(ACTUAL_TARGETS1:%.dll=%.so)
     ACTUAL_TARGETS3 = $(ACTUAL_TARGETS2:%.so=$(DYNAMIC_LIBRARY_DIR)/%$(TRIPART_VERSION).so)
   else
@@ -444,7 +308,7 @@ endif
 #hmmm: fix this.
 
 # Adds the main CLAM system in to get some work done.  This should be placed
-# after the module's rules are defined and before the module's targets are
+# after the module rules are defined and before the module targets are
 # defined.
 include rules.def
 
@@ -473,15 +337,9 @@ cpp_add_to_cleanups_variable:
 
 $(OBJECT_DIR)/%.obj: $(CURRENT_DIR)/%.cpp
 ifeq "$(NO_COMPILE)" ""
-  ifneq "$(COMPILER)" "VISUAL_CPP"
 	@echo Compiling Object [$(notdir $@)]
 	$(HIDESH)-c 'if [ ! -d $(@D) ]; then mkdir $(@D); fi'
 	$(CATCHER)$(CC) $(COMPILER_FLAGS) -c $< $(OBJECT_NAME_FLAG)$@
-  else
-	@echo $< >>$(BUILD_LIST_FILE)
-	@echo $@ >>$(BUILD_WHACK_FILE)
-	@echo >$@
-  endif
 endif
 
 ############################################################################
@@ -490,43 +348,21 @@ endif
 
 $(OBJECT_DIR)/%.obj: $(CURRENT_DIR)/%.c
 ifeq "$(NO_COMPILE)" ""
-  ifneq "$(COMPILER)" "VISUAL_CPP"
 	@echo Compiling Object [$(notdir $@)]
 	$(HIDESH)-c 'if [ ! -d $(@D) ]; then mkdir $(@D); fi'
 	$(CATCHER)$(CC) $(COMPILER_FLAGS) -c $< $(OBJECT_NAME_FLAG)$@
-  else
-	@echo $< >>$(BUILD_LIST_FILE)
-	@echo $@ >>$(BUILD_WHACK_FILE)
-	@echo >$@
-  endif
 endif
 
 ############################################################################
 
 # resource compiler for win32.
 
-ifeq "$(COMPILER)" "VISUAL_CPP"
-$(OBJECT_DIR)/%.res: %.rc $(PARAMETER_FILE)
-  ifeq "$(NO_COMPILE)" ""
-	@echo Resource [$@]
-	$(HIDESH)-c 'if [ ! -d $(@D) ]; then mkdir $(@D); fi'
-	$(CATCHER)$(RC) -r $(DEFINITIONS:%=-D%) $(HEADER_SEARCH_PATH:%=-i%) -fo $@ $<
-  endif
-
-$(OBJECT_DIR)/%.resources: %.resx $(PARAMETER_FILE)
-  ifeq "$(NO_COMPILE)" ""
-	@echo Resource [$@]
-	$(HIDESH)-c 'if [ ! -d $(@D) ]; then mkdir $(@D); fi'
-	$(VCS_ROOT)/../SDK/v1.1/bin/resgen $< $@
-  endif
-else #non-visual studio
-  # this platform probably does not use rc files.
+# we currently do not use rc files.
 $(OBJECT_DIR)/%.res: %.rc
   ifeq "$(NO_COMPILE)" ""
 	@echo Bogus resource [$@]
 	@echo >$@
   endif
-endif #win32
 
 ############################################################################
 
@@ -539,9 +375,6 @@ ifeq "$(NO_COMPILE)" ""
 $(STATIC_LIBRARY_DIR)/%.library: $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_LOCAL_LIBS:%=$(STATIC_LIBRARY_DIR)/$(LIB_PREFIX)%$(LIB_ENDING)) $(PARAMETER_FILE)
 	$(HIDER)echo Building Static Library [$(notdir $@)]
 	@echo $@ >$(DIRTY_FILE)
-  ifeq "$(COMPILER)" "VISUAL_CPP"
-	$(HIDESH)-c 'if [ -f $(BUILD_LIST_FILE) ]; then $(SHELL) $(CLAM_SCRIPTS)/cpp/rebuild_oldies.sh $(MULTI_BUILD_CMD); fi'
-  endif
 	$(CATCHER)$(LIBRARY_TOOL) $(LIBRARIAN_FLAGS) $(CREATE_LIBRARY_FLAG)$@ $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%)
   ifneq "$(OP_SYSTEM)" "UNIX"
 	$(HIDER)mv $@ $(STATIC_LIBRARY_DIR)/$(LIB_PREFIX)$*$(LIB_ENDING)
@@ -559,7 +392,7 @@ endif #no_compile
 
 # we whack any existing LIB file, since we want to use changes in that file
 # as a clue for when we should rescan the dependencies.  we'd be fine if
-# visual c++ didn't keep an existing LIB if it doesn't change (even when the
+# visual c++ didn't keep an existing LIB if it does not change (even when the
 # DLL does).
 
 ifneq "$(NO_COMPILE)" ""
@@ -568,13 +401,8 @@ endif
 
 ifeq "$(NO_COMPILE)" ""
 $(DYNAMIC_LIBRARY_DIR)/%.dll: $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_LOCAL_LIBS:%=$(STATIC_LIBRARY_DIR)/$(LIB_PREFIX)%$(LIB_ENDING)) $(ACTUAL_RESX) $(PARAMETER_FILE) 
-#hmmm: use the res objects variable to rebuild res files as needed.
-###$(RES_OBJECTS) 
 	$(HIDER)echo Building Dynamic Library [$(notdir $@)]
 	@echo $@ >$(DIRTY_FILE)
-  ifeq "$(COMPILER)" "VISUAL_CPP"
-	$(HIDESH)-c 'if [ -f $(BUILD_LIST_FILE) ]; then $(SHELL) $(CLAM_SCRIPTS)/cpp/rebuild_oldies.sh $(MULTI_BUILD_CMD); fi'
-  endif
 	$(HIDER)rm -f $(@:%.dll=%.lib)
 	echo about to run link tool.
 	$(CATCHER)$(LINK_TOOL) $(LINKER_OUTPUT_FLAG)$@ -dll $(LOAD_FLAG_PREFIX) $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_RESX_FLAGS) $(ACTUAL_LOCAL_LIBS:%=$(LIBRARY_NAME_FLAG)$(LIB_PREFIX)%$(LIB_ENDING)) $(LOAD_FLAG_SUFFIX)
@@ -609,46 +437,18 @@ endif #no_compile
 
 # creates "exe" executables using all of the appropriate objects.
 
-ifeq "$(COMPILER)" "VISUAL_CPP"
-  ifneq "$(NO_COMPILE)" ""
-$(EXECUTABLE_DIR)/%.exe:
-  endif
-
-  ifeq "$(NO_COMPILE)" ""
-$(EXECUTABLE_DIR)/%.exe: $(OBJECT_DIR)/%.obj $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_LOCAL_LIBS:%=$(STATIC_LIBRARY_DIR)/$(LIB_PREFIX)%$(LIB_ENDING)) $(ACTUAL_RESX) $(PARAMETER_FILE)
-	$(HIDER)echo Building Application [$(notdir $@)]
-	@echo $@ >$(DIRTY_FILE)
-    ifeq "$(COMPILER)" "VISUAL_CPP"
-	$(HIDESH)-c 'if [ -f $(BUILD_LIST_FILE) ]; then $(SHELL) $(CLAM_SCRIPTS)/cpp/rebuild_oldies.sh $(MULTI_BUILD_CMD); fi'
-    endif
-	$(CATCHER)$(LINK_TOOL) $(EXE_FLAGS) $(LOAD_FLAG_PREFIX) $< $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_RESX_FLAGS) $(ACTUAL_LOCAL_LIBS:%=$(LIBRARY_NAME_FLAG)$(LIB_PREFIX)%$(LIB_ENDING)) $(LOAD_FLAG_SUFFIX) $(LINKER_OUTPUT_FLAG)$@
-#$(^:force_rebuild=) 
-    ifeq "$(COMPILER_VERSION)" "8"
-	$(HIDESH)$(CLAM_SCRIPTS)/cpp/ms_manifest.sh "$@" "1"
-    endif
-    ifeq "$(COMPILER_VERSION)" "10"
-	$(HIDESH)$(CLAM_SCRIPTS)/cpp/ms_manifest.sh "$@" "1"
-    endif
-    ifneq "$(VCPP_VISTA_ICON)" ""
-	$(HIDER)ReplaceVistaIcon "$@" "$(VCPP_VISTA_ICON)"
-    endif
-  endif #no_compile
-endif #visual studio
-
-ifneq "$(COMPILER)" "VISUAL_CPP"
-  ifneq "$(NO_COMPILE)" ""
+ifneq "$(NO_COMPILE)" ""
 $(EXECUTABLE_DIR)/%:
-  endif
+endif
 
-  ifeq "$(NO_COMPILE)" ""
+ifeq "$(NO_COMPILE)" ""
 $(EXECUTABLE_DIR)/%: $(OBJECT_DIR)/%.obj $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_LOCAL_LIBS:%=$(STATIC_LIBRARY_DIR)/$(LIB_PREFIX)%$(LIB_ENDING)) $(PARAMETER_FILE)
 	$(HIDER)echo Building Application [$(notdir $@)]
 	@echo $@ >$(DIRTY_FILE)
 	$(CATCHER)$(LINK_TOOL) $(EXE_FLAGS) $(LOAD_FLAG_PREFIX) $< $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_LOCAL_LIBS:%=$(LIBRARY_NAME_FLAG)%) $(LOAD_FLAG_SUFFIX) $(LINKER_OUTPUT_FLAG)$@
 #hmmm: experimental item below.
 #$(^:force_rebuild=) 
-  endif #no_compile
-endif #unix
+endif #no_compile
 
 ############################################################################
 
@@ -731,10 +531,10 @@ else
   deps: $(DEPS_FILE)
 
   # this causes the dependency file to be regenerated if the sources or libs
-  # have changed.  we have to touch the deps file in case it's missing;
-  # makedep doesn't deal well with that.  also, we touch the dirty flag file
+  # have changed.  we have to touch the deps file in case it is missing;
+  # makedep does not deal well with that.  also, we touch the dirty flag file
   # to ensure that the fact we redid dependencies for some reason causes us
-  # to re-promote.  we only bother with any of this if we know we're going
+  # to re-promote.  we only bother with any of this if we know we are going
   # to really do some compilation; if in non-compile mode, we'll skip it.
   ifneq "$(NO_COMPILE)" ""
     # no dependencies in non-compile mode.