X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fclam%2Fcpp%2Frules.def;h=6e5651627c0300dda0b5e107906332b3534162ca;hb=86731240bf17a61dbf29b78ec64d84f2e6052d57;hp=7876b49f111201fe0122b0aa77f48354ab87b119;hpb=f6cd637b4e8ac3663ad196cdfa2fab088201471f;p=feisty_meow.git

diff --git a/scripts/clam/cpp/rules.def b/scripts/clam/cpp/rules.def
index 7876b49f..6e565162 100644
--- a/scripts/clam/cpp/rules.def
+++ b/scripts/clam/cpp/rules.def
@@ -15,15 +15,6 @@
 # This section manipulates variable values to prepare them for their use
 # in the standard CLAM support.
 
-# special actions for projects that are tests.
-ifneq "$(findstring test, $(TYPE))" ""
-  # add the clean task at the end, so that we will always rebuild the tests
-  # and run them again.
-#hmmm: this is a kludge to make sure we always run the tests.  there has got
-#      to be a better way.
-  LAST_TARGETS += clean
-endif
-
 # see if they have got the clean flag set.  if so, we will not build anything.
 ifneq "$(CLEAN)" ""
   NO_COMPILE = t
@@ -74,7 +65,7 @@ LIBS_USED += Xmu
 
   ifneq "$(USE_CURL)" ""
     COMPILER_FLAGS += `curl-config --cflags`
-    LOAD_FLAG_SUFFIX += `curl-config --static-libs`
+    LOAD_FLAG_SUFFIX += `curl-config --libs`
   endif
 
 endif
@@ -284,10 +275,10 @@ COMPILER_FLAGS += $(HEADER_SEARCH_PATH:%=-I%) $(DEFINITIONS:%=-D%) $(UNDEFINITIO
 # to search and by adding all of the code libraries that are used.
 LOAD_FLAG_PREFIX += $(LIBRARY_SEARCH_PATH:%=$(LIBRARY_PATH_FLAG)%)
 ifeq "$(OP_SYSTEM)" "UNIX"
-#  ifneq "$(COMPILER)" "GNU_DARWIN"
+  ifneq "$(COMPILER)" "GNU_DARWIN"
     LOAD_FLAG_PREFIX += -Xlinker --start-group
     LOAD_FLAG_SUFFIX += -Xlinker --end-group
-#  endif
+  endif
 endif
 # had to switch from prefix to suffix recently.  oddity.
 #LOAD_FLAG_PREFIX += $(LIBS_USED:%=$(LIBRARY_NAME_FLAG)%)