Changeset 26441

Timestamp:

Dec 16, 2009, 12:43:13 PM (16 years ago)

Author:

bills

Message:

Build magic/remove directly instead of the hacky old way

Location:

trunk

Files:

• magic/Makefile (modified) (2 diffs)
• psconfig/tagsets/ipp-2.9.dist (modified) (1 diff)

trunk/magic/Makefile

@@ -2 +2 @@
 default: all
 
-all: ssa-core-cpp magic remove
+all: ssa-core-cpp magic
 
-install: magic.install remove.install
+install: magic.install
 
 clean:
@@ -30 +30 @@
         if [ -d magic ]; then (cd magic && make -f Makefile.magic install); fi
 
-REMOVE = remove/src
-
-remove: FORCE
-        @cd $(REMOVE) && make -f Makefile.simple all
-
-remove.install: remove
-        @cd $(REMOVE) && make -f Makefile.simple install
-
 FORCE:

trunk/psconfig/tagsets/ipp-2.9.dist

@@ -76 +76 @@
   YYYYY  magic                  ipp-2-9          -0
   YYYYY  magic/censorObjects    ipp-2-9          -0
+  YYYYY  magic/remove           ipp-2-9          -0
 
 # there are externally required C libraries and perl modules (see INSTALL)