diff -u -r1.12 -r1.13
--- gdml.gmk	6 Dec 2005 00:54:18 -0000	1.12
+++ gdml.gmk	31 Mar 2006 01:10:07 -0000	1.13
@@ -1,36 +1,39 @@

-# $Header: /cvs/lcd/slic/config/make/gdml.gmk,v 1.12 2005/12/06 00:54:18 jeremy Exp $

+# $Header: /cvs/lcd/slic/config/make/gdml.gmk,v 1.13 2006/03/31 01:10:07 jeremy Exp $

 
 #
 # GDML make fragment
 #
 

-ifdef GDML_BASE

+ifndef GDML_BASE
+  $(error define GDML_BASE=/path/to/GDML2/CPPGDML
+endif

-  # lib dir
-  ifndef GDML_LIB_DIR

+# lib dir
+ifndef GDML_LIB_DIR

-    # guess lib dir if not set
-    ifdef G4SYSTEM
-      GDML_LIB_DIR = $(GDML_BASE)/build/$(G4SYSTEM)/lib
-    else
-      $(error Can't guess GDML_LIB_DIR because G4SYSTEM is not set.)
-    endif

+  # guess lib dir if not set
+  ifdef G4SYSTEM
+    GDML_LIB_DIR = $(GDML_BASE)/build/$(G4SYSTEM)/lib
+  else
+    $(error Can't guess GDML_LIB_DIR because G4SYSTEM is not set.)

   endif

-
-  # GDML includes
-  CPPFLAGS += -I$(GDML_BASE)/G4Binding/G4Processor \
-              -I$(GDML_BASE)/G4Binding/G4Subscribers \
-              -I$(GDML_BASE)/G4Binding/G4Writer \
-              -I$(GDML_BASE)/Common/Writer \
-              -I$(GDML_BASE)/Common/Schema \
-              -I$(GDML_BASE)/Common/Processes \
-              -I$(GDML_BASE)/Common/Saxana
-
-  GDML_LINK_LIBS += -L$(GDML_LIB_DIR)
-  # FIXME: ugly static link order
-  GDML_LINK_LIBS += -lSaxana -lProcesses -lWriter -lG4Processor -lG4Subscribers -lG4Writer -lG4Subscribers -lG4Processor -lSaxana -lProcesses -lWriter
-
-  EXTRALIBS += $(GDML_LINK_LIBS)
-else
-  $(error define GDML_BASE=/path/to/GDML2/CPPGDML)

 endif