Changeset 1228 for trunk/source/GNUmakefile

Timestamp:

Jan 8, 2010, 11:56:51 AM (14 years ago)

Author:

garnier

Message:

update geant4.9.3 tag

File:

• trunk/source/GNUmakefile (modified) (7 diffs)

trunk/source/GNUmakefile

@@ -1 @@
-# $Id: GNUmakefile,v 1.90 2009/01/23 11:06:13 gcosmo Exp $
+# $Id: GNUmakefile,v 1.95 2009/11/27 10:55:26 gcosmo Exp $
 # -----------------------------------------------------------------
 # "gmake" makes default libraries for each subdomain.
@@ -110 +110 @@
         @$(CC) $(CCFLAGS) -o $(G4LIBDIR)/liblist $(G4INSTALL)/config/liblist.c
 
-dll: banner win32def
+clean_tmps:
+        @$(ECHO) "Clearing temporary objects ..."
+        @rm -rf $(G4LIBDIR)/*.def $(G4LIBDIR)/*.exp
+        @rm -rf $(G4TMPDIR)/*
+
+dll_build: banner win32def
 ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
         @$(ECHO) "Verifying existence of global libraries for DLLs ..."
@@ -116 +121 @@
         @$(ECHO) "Building Windows DLL libraries ..."
         @$(MAKE) kernel_global G4LIB_BUILD_DLL=1 G4LIB_BUILD_SHARED=1
-        @$(ECHO) "Clearing temporary DLL objects and temporaries ..."
-        @rm -rf $(G4LIBDIR)/*.def $(G4LIBDIR)/*.exp
-        @rm -rf $(G4TMPDIR)/*
 ifdef G4LIB_USE_G3TOG4
         @for dir in $(SUBDIR4); do (cd $$dir && $(MAKE)); done;:
@@ -124 +126 @@
 endif
         @$(ECHO) "Done !"
+endif
+
+dll:
+ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
+        @$(MAKE) dll_build
+        @$(MAKE) clean_tmps
 else
         @$(ECHO) "Sorry !"
@@ -150 +158 @@
 banner:
         @$(ECHO) "*************************************************************"
-        @$(ECHO) " Installation Geant4 version $$Name: geant4-09-02-ref-02 $ "
+        @$(ECHO) " Installation Geant4 version $$Name: geant4-09-03 $ "
         @$(ECHO) " Copyright (C) 1994-2009 Geant4 Collaboration                            "
         @$(ECHO) "*************************************************************"
@@ -169 +177 @@
         @rm -rf $(G4LIBDIR)
         @rm -rf $(G4BINDIR)
+        @rm -rf $(G4INSTALL)/source/interfaces/*/moc
+        @rm -rf $(G4INSTALL)/source/visualization/*/moc
         @rm -rf $(G4INSTALL)/.config/bin/$(G4SYSTEM)
 ifdef CFRONT
@@ -187 +197 @@
         @$(ECHO) Removing $(G4INCLUDE) ...
         @rm -rf $(G4INCLUDE)
+        @$(ECHO) Removing Qt moc source files ...
+        @rm -rf $(G4INSTALL)/source/interfaces/*/moc
+        @rm -rf $(G4INSTALL)/source/visualization/*/moc
         @$(ECHO) Removing installation configurations ...
         @rm -rf $(G4INSTALL)/.config