projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
proving git release script isn't busted
[feisty_meow.git]
/
scripts
/
clam
/
cpp
/
rules.def
diff --git
a/scripts/clam/cpp/rules.def
b/scripts/clam/cpp/rules.def
index 208728d9cb54e9ff718a367297f31fcfde68331b..7a04cc83c1bac59296339bd5e64a9ce81ead0a9a 100644
(file)
--- a/
scripts/clam/cpp/rules.def
+++ b/
scripts/clam/cpp/rules.def
@@
-104,6
+104,10
@@
endif
###############################################################################
ifeq "$(COMPILER)" "GNU_DARWIN"
###############################################################################
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 +=
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++
#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)" ""
endif
ifneq "$(USE_SSL)" ""
- LIBS_USED += crypto
+ LIBS_USED += crypto
ssl
endif
ifneq "$(USE_WXWIDGETS)" ""
endif
ifneq "$(USE_WXWIDGETS)" ""
@@
-678,7
+682,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)
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_BINARIES)/version_stamper$(EXE_END) . $(PARAMETER_FILE)
+ $(CATCHER)$(CLAM_BINARIES)/version_stamper$(EXE_END) . $(
FEISTY_MEOW_GENERATED_STORE)/versions $(
PARAMETER_FILE)
endif
endif
endif
endif
@@
-769,10
+773,11
@@
endif # no-deps.
############################################################################
############################################################################
-# examines the required variables and complains if they
'
re missing.
+# examines the required variables and complains if they
a
re missing.
check_requirements:
$(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'
check_requirements:
$(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'
############################################################################
############################################################################