X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fclam%2Fcpp%2Frules.def;h=b1792bfd2a9a1aaf2a0f32e781b489c94908f1ac;hb=239fe2ca67e905f1c752394857038330fddd6ff4;hp=0b9c359933abf62421bb77ddc2ac83bf56384b1a;hpb=cbf31846e80e3facbf5455bd3c5c6c81c4fdfabe;p=feisty_meow.git diff --git a/scripts/clam/cpp/rules.def b/scripts/clam/cpp/rules.def index 0b9c3599..b1792bfd 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. ############################################################################### @@ -92,6 +92,8 @@ ifeq "$(COMPILER)" "GNU_WINDOWS" LOAD_FLAG_PREFIX += $(shell wx-config --libs $(UNICODE_FLAG_ADD) ) endif +LOAD_FLAG_PREFIX += -lwsock32 -lmswsock -shared + ifneq "$(USE_CURL)" "" COMPILER_FLAGS += `curl-config --cflags` LOAD_FLAG_SUFFIX += `curl-config --libs` @@ -102,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 += @@ -109,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)" "" @@ -152,7 +158,7 @@ ifneq "$(OP_SYSTEM)" "WIN32" 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. + # have a "USE_FREETDS = true" statement. # is this particular library or app using freetds? ifneq "$(USE_FREETDS)" "" @@ -162,102 +168,101 @@ ifneq "$(OP_SYSTEM)" "WIN32" endif endif -# win32 compiler additions. -ifeq "$(OP_SYSTEM)" "WIN32" +## 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 +# # 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 +# endi#f +# 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 -## 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 -# LIBS_USED += libeay32.lib - $(shell cp $(THIRD_PARTY_DIR)/openssl/lib/*dll $(EXECUTABLE_DIR) ) - endif - -endif - -ifeq "$(OP_SYSTEM)" "WIN32" - # 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 +#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 +#endif # Create the real list of local libraries needed. TEMP_LOC1 = $(LOCAL_LIBS_USED:%=%$(TRIPART_VERSION)) @@ -266,22 +271,25 @@ 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 "$(OP_SYSTEM)" "WIN32" - 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 +#ifeq "$(COMPILER)" "VISUAL_CPP" +# ifneq "$(OMIT_VERSIONS)" "" +# # remove version rc files if we are 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 + TEMP_OBJ4 = $(TEMP_OBJ3:%.h=%.bad) OBJECTS = $(TEMP_OBJ4) @@ -330,15 +338,15 @@ MULTI_BUILD_CMD = $(CC) $(COMPILER_FLAGS) -c `cat $(BUILD_LIST_FILE)` $(OBJECT_N # 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, +# 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" - # 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 +# 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)" "" @@ -347,42 +355,52 @@ ifeq "$(OMIT_VERSIONS)" "" endif endif -ifneq "$(GENDEPS)" "" - EXTRA_FIRST_TARGETS += gendeps -endif +# if we are cleaning up, then do not generate dependency file. +ifeq "$(CLEAN)" "" + ifneq "$(GENDEPS)" "" + EXTRA_FIRST_TARGETS += gendeps + endif # only do the deps generation for makefiles that are properly marked. ifneq "$(findstring __BUILD_STATIC_APPLICATION__, $(DEFINITIONS))" "" # generate static build dependencies for all targets in the makefile. GENERATED_DEPS_LIST = $(TARGETS:%.exe=%.gendeps) +else + GENERATED_DEPS_LIST = +endif + endif # Make sure that the directory for objects exists. ACTUAL_FIRST_TARGETS = check_requirements $(EXTRA_FIRST_TARGETS) $(VERSION_TARGET) $(FIRST_TARGETS) pre_compilation # Adds the primary targets to the list of products to create. -ifeq "$(NO_COMPILE)" "" - ifneq "$(COMPILER)" "VISUAL_CPP" +#ifeq "$(NO_COMPILE)" "" + + 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 ACTUAL_TARGETS2 = $(ACTUAL_TARGETS1:%.so=%.dll) ACTUAL_TARGETS3 = $(ACTUAL_TARGETS2:%.dll=$(DYNAMIC_LIBRARY_DIR)/%$(TRIPART_VERSION).dll) endif + ACTUAL_TARGETS4 = $(ACTUAL_TARGETS3:%.lib=$(STATIC_LIBRARY_DIR)/%$(TRIPART_VERSION).library) ACTUAL_TARGETS = $(ACTUAL_TARGETS4:%.elf=$(EXECUTABLE_DIR)/%.elf) -else #is no_compile - ACTUAL_TARGETS1 = $(TARGETS:%.exe=) - ACTUAL_TARGETS2 = $(ACTUAL_TARGETS1:%.dll=) - ACTUAL_TARGETS3 = $(ACTUAL_TARGETS2:%.so=) - ACTUAL_TARGETS4 = $(ACTUAL_TARGETS3:%.lib=) - ACTUAL_TARGETS = $(ACTUAL_TARGETS4:%.elf=) -endif + +#else #is no_compile +# ACTUAL_TARGETS1 = $(TARGETS:%.exe=) +# ACTUAL_TARGETS2 = $(ACTUAL_TARGETS1:%.dll=) +# ACTUAL_TARGETS3 = $(ACTUAL_TARGETS2:%.so=) +# ACTUAL_TARGETS4 = $(ACTUAL_TARGETS3:%.lib=) +# ACTUAL_TARGETS = $(ACTUAL_TARGETS4:%.elf=) +#endif # Adds the last few targets for CLAM to do. ACTUAL_LAST_TARGETS = post_compilation $(LAST_TARGETS) @@ -402,13 +420,13 @@ ACTUAL_LAST_TARGETS = post_compilation $(LAST_TARGETS) # without hosing it up. %.nil: ifeq "$(NO_COMPILE)" "" - $(CATCHER)$(CC) -c $(CLAM_DIR)/cpp/blank_target.c -o $@ + $(CATCHER)$(CC) -c $(CLAM_SCRIPTS)/cpp/blank_target.c -o $@ endif %.bad: @echo There is a problem with the makefile in the SOURCE variable. @echo The offending item is: $@ - $(HIDESH)$(CLAM_DIR)/exit_make.sh + $(HIDESH)$(CLAM_SCRIPTS)/exit_make.sh ## faked debug object. #%.obj: %.cpp @@ -417,10 +435,40 @@ endif # $(CATCHER)$(CC) $(COMPILER_FLAGS) -c $< $(OBJECT_NAME_FLAG)$(TEMP)/$@ #endif +ifeq "$(CLEAN)" "" # recreate dependencies for static applications. %.gendeps: %.cpp @echo "Generating Static Deps: $*.cpp" - $(CATCHER)$(CLAM_DIR)/cpp/buildor_gen_deps.sh "$*.cpp" + $(CATCHER)$(CLAM_SCRIPTS)/cpp/buildor_gen_deps.sh "$*.cpp" +endif + +############################################################################ + +# trying to delay loading this as long as possible so the built in rule system for CLEANUPS can run with the right values. +# so far not working right! +#hmmm: fix this. + +# Adds the main CLAM system in to get some work done. This should be placed +# after the module rules are defined and before the module targets are +# defined. +include rules.def + +############################################################################ + +# this adds in a customization for the cleanup variables, since the base +# clam code has no idea about a dynamic library directory. + +cpp_add_to_cleanups_variable: +# echo here is actual targets before hand $(ACTUAL_TARGETS) + $(eval CLEANUPS = $(ACTUAL_TARGETS:%.exe=%) $(ACTUAL_TARGETS:$(STATIC_LIBRARY_DIR)/%.library=$(STATIC_LIBRARY_DIR)/$(LIB_PREFIX)%.a) $(CLEANUPS) ) +# echo "IN CPP, new CLEANUPS variable: $(CLEANUPS)" +#fodder for anything missing a cleanup. +# $(eval CLEANUPS = $(ACTUAL_TARGETS) $(ACTUAL_TARGETS:%.dll=%.so) $(ACTUAL_TARGETS:%.so=%.dll) $(CLEANUPS) ) + +#dynamic is taken care of in clam base still? +#DYNAMIC_LIBRARY_DIR +#hmmm: still should change there in the base and do it +# here instead. ############################################################################ @@ -430,15 +478,15 @@ endif $(OBJECT_DIR)/%.obj: $(CURRENT_DIR)/%.cpp ifeq "$(NO_COMPILE)" "" - ifneq "$(COMPILER)" "VISUAL_CPP" +# 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 +# else +# @echo $< >>$(BUILD_LIST_FILE) +# @echo $@ >>$(BUILD_WHACK_FILE) +# @echo >$@ +# endif endif ############################################################################ @@ -447,43 +495,43 @@ endif $(OBJECT_DIR)/%.obj: $(CURRENT_DIR)/%.c ifeq "$(NO_COMPILE)" "" - ifneq "$(COMPILER)" "VISUAL_CPP" +# 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 +# else +# @echo $< >>$(BUILD_LIST_FILE) +# @echo $@ >>$(BUILD_WHACK_FILE) +# @echo >$@ +# endif endif ############################################################################ # resource compiler for win32. -ifeq "$(OP_SYSTEM)" "WIN32" -$(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-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. $(OBJECT_DIR)/%.res: %.rc ifeq "$(NO_COMPILE)" "" @echo Bogus resource [$@] @echo >$@ endif -endif #win32 +#endif #win32 ############################################################################ @@ -496,9 +544,9 @@ 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_DIR)/cpp/rebuild_oldies.sh $(MULTI_BUILD_CMD); fi' - endif +# 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) @@ -516,7 +564,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)" "" @@ -529,18 +577,19 @@ $(DYNAMIC_LIBRARY_DIR)/%.dll: $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(ACTUAL_LOCAL ###$(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_DIR)/cpp/rebuild_oldies.sh $(MULTI_BUILD_CMD); fi' - endif +# ifeq "$(COMPILER)" "VISUAL_CPP" +# $(HIDESH)-c 'if [ -f $(BUILD_LIST_FILE) ]; then $(SHELL) $(CLAM_SCRIPTS)/cpp/rebuild_oldies.sh $(MULTI_BUILD_CMD); fi' +# endif +#hmmm: this is way way out of date. not right now. $(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) echo ran link tool. ifeq "$(COMPILER_VERSION)" "8" - $(HIDESH)$(CLAM_DIR)/cpp/ms_manifest.sh "$@" "2" + $(HIDESH)$(CLAM_SCRIPTS)/cpp/ms_manifest.sh "$@" "2" endif ifeq "$(COMPILER_VERSION)" "10" - $(HIDESH)$(CLAM_DIR)/cpp/ms_manifest.sh "$@" "2" + $(HIDESH)$(CLAM_SCRIPTS)/cpp/ms_manifest.sh "$@" "2" endif ifneq "$(VCPP_VISTA_ICON)" "" $(HIDER)ReplaceVistaIcon "$@" "$(VCPP_VISTA_ICON)" @@ -566,33 +615,33 @@ 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_DIR)/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_DIR)/cpp/ms_manifest.sh "$@" "1" - endif - ifeq "$(COMPILER_VERSION)" "10" - $(HIDESH)$(CLAM_DIR)/cpp/ms_manifest.sh "$@" "1" - endif - ifneq "$(VCPP_VISTA_ICON)" "" - $(HIDER)ReplaceVistaIcon "$@" "$(VCPP_VISTA_ICON)" - endif - endif #no_compile -endif #visual studio +#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 "$(COMPILER)" "VISUAL_CPP" ifneq "$(NO_COMPILE)" "" $(EXECUTABLE_DIR)/%: endif @@ -605,7 +654,7 @@ $(EXECUTABLE_DIR)/%: $(OBJECT_DIR)/%.obj $(ACTUAL_OBJECTS:%=$(OBJECT_DIR)/%) $(A #hmmm: experimental item below. #$(^:force_rebuild=) endif #no_compile -endif #unix +#endif #unix ############################################################################ @@ -635,7 +684,7 @@ ifeq "$(OMIT_VERSIONS)" "" ifneq "$(VERSION_RC_ROOT)" "" # only redo the version resource if it or version.ini is out of date. %_version.rc: version.ini $(PARAMETER_FILE) - $(CATCHER)$(CLAM_BINARY_DIR)/version_stamper$(EXE_END) . $(PARAMETER_FILE) + $(CATCHER)$(CLAM_BINARIES)/version_stamper$(EXE_END) . $(FEISTY_MEOW_GENERATED_STORE)/versions $(PARAMETER_FILE) endif endif @@ -643,11 +692,6 @@ endif # Now the active part of the make process... -# 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 -# defined. -include rules.def - # make sure we really want to include the dependencies file. ifeq "$(TYPE)" "hierarchy" # no dependencies for a simple hierarchy builder. @@ -656,7 +700,7 @@ endif ifneq "$(CLEAN)" "" NO_DEPS = t # no dependencies get left when we are cleaning up. - $(shell rm -f $(DEPS_FILE)) +# $(shell rm -f $(DEPS_FILE)) endif ifneq "$(NO_COMPILE)" "" # non compiling projects do not need dependencies. @@ -668,15 +712,10 @@ ifneq "$(REBUILD)" "" $(shell rm -f $(DEPS_FILE)) endif -# includes the auto-dependency information. the dependency file is checked -# for being up-to-date. if not, it gets rebuilt and the make is restarted. -ifeq "$(NO_DEPS)" "" - include $(DEPS_FILE) -endif - # preserves intermediate files from being deleted. ifeq "$(CLEAN)" "" -.PRECIOUS: $(OBJECT_DIR)/%.obj $(OBJECT_DIR)/%.res $(OBJECT_DIR)/%.resources +.PRECIOUS: $(OBJECT_DIR)/%.obj $(OBJECT_DIR)/%.res $(OBJECT_DIR)/%.resources $(OBJECT_DIR)/%.deps +#hmmm: added above deps. maybe not right. endif # zaps things when they could not be created correctly. @@ -694,13 +733,14 @@ ifneq "$(NO_DEPS)" "" $(DEPS_FILE): $(PARAMETER_FILE) else + ifeq "$(CLEAN)" "" 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. @@ -718,27 +758,50 @@ else endif endif @echo Dependencies [$(notdir $@)] - -$(HIDESH)$(CLAM_DIR)/cpp/preconditions.sh + -$(HIDESH)$(CLAM_SCRIPTS)/cpp/preconditions.sh @touch $@ # @echo dep adds: $(DEPENDENCY_ADDITIONS) - @$(CLAM_BINARY_DIR)/makedep$(EXE_END) $(DEPENDENCY_DEFINITIONS:%=-D%) $(DEPENDENCY_ADDITIONS) -f$@ -o.obj -p$(OBJECT_DIR)/ -w 420 $(COMPILER_HEADER_DIR:%=-X%) $(THIRD_PARTY_DIR:%=-X%) -- $(COMPILER_FLAGS) $(SOURCE) $(EXE_CPPS) -# $(CATCHER)$(CLAM_BINARY_DIR)/makedep$(EXE_END) $(DEPENDENCY_DEFINITIONS:%=-D%) $(DEPENDENCY_ADDITIONS) -f$@ -o.obj -p$(OBJECT_DIR)/ -w 420 $(COMPILER_HEADER_DIR:%=-X%) $(THIRD_PARTY_DIR:%=-X%) -- $(COMPILER_FLAGS) $(SOURCE) $(EXE_CPPS) + @$(CLAM_BINARIES)/makedep$(EXE_END) $(DEPENDENCY_DEFINITIONS:%=-D%) $(DEPENDENCY_ADDITIONS) -f$@ -o.obj -p$(OBJECT_DIR)/ -w 420 $(COMPILER_HEADER_DIR:%=-X%) $(THIRD_PARTY_DIR:%=-X%) -- $(COMPILER_FLAGS) $(SOURCE) $(EXE_CPPS) +# $(CATCHER)$(CLAM_BINARIES)/makedep$(EXE_END) $(DEPENDENCY_DEFINITIONS:%=-D%) $(DEPENDENCY_ADDITIONS) -f$@ -o.obj -p$(OBJECT_DIR)/ -w 420 $(COMPILER_HEADER_DIR:%=-X%) $(THIRD_PARTY_DIR:%=-X%) -- $(COMPILER_FLAGS) $(SOURCE) $(EXE_CPPS) @echo $@ >$(SUBMAKE_FLAG) endif # non-compile. + else # cleaning. + # makes the dependencies a no-op for cleaning. + deps: $(PARAMETER_FILE) + + $(DEPS_FILE): $(PARAMETER_FILE) + endif endif # no-deps. ############################################################################ -# examines the required variables and complains if they're missing. +# examines the required variables and complains if they are missing. check_requirements: - $(HIDESH) -c 'if [ -z "$(PROJECT)" ]; then echo the PROJECT variable is not defined!; . $(CLAM_DIR)/exit_make.sh; fi' - $(HIDESH) -c 'if [ -z "$(TYPE)" ]; then echo the TYPE variable is not defined!; . $(CLAM_DIR)/exit_make.sh; fi' + $(HIDESH) -c 'if [ -z "$(PROJECT)" ]; then echo the PROJECT variable is not defined!; . $(CLAM_SCRIPTS)/exit_make.sh; fi' + $(HIDESH) -c 'if [ -z "$(TYPE)" ]; then echo the TYPE variable is not defined!; . $(CLAM_SCRIPTS)/exit_make.sh; fi' + $(HIDESH) -c 'if [ ! -d $(FEISTY_MEOW_GENERATED_STORE)/versions ]; then mkdir $(FEISTY_MEOW_GENERATED_STORE)/versions; fi' ############################################################################ +# includes the auto-dependency information. the dependency file is checked +# for being up-to-date. if not, it gets rebuilt and the make is restarted. +ifeq "$(CLEAN)" "" + ifeq "$(NO_DEPS)" "" + + # thank the buddha for this bit of code, or at least thank this page: + # http://stackoverflow.com/questions/5553352/how-do-i-check-if-file-exists-in-makefile + ifneq ("$(wildcard $(DEPS_FILE))","") + include $(DEPS_FILE) + endif + + endif +endif + +############################################################################ + # calls the script for preparing output directories and such. pre_compilation: - $(HIDESH)$(CLAM_DIR)/cpp/preconditions.sh + $(HIDESH)$(CLAM_SCRIPTS)/cpp/preconditions.sh ############################################################################ @@ -746,7 +809,7 @@ pre_compilation: # we don't bother reporting errors from touch since there will sometimes # not be any objects in the final directory. post_compilation: - $(HIDESH)$(CLAM_DIR)/cpp/postconditions.sh + $(HIDESH)$(CLAM_SCRIPTS)/cpp/postconditions.sh ############################################################################