Pārlūkot izejas kodu

removed necessary dependencies to DBV

Bjoern Froehlich 12 gadi atpakaļ
vecāks
revīzija
dc2e2032d3
2 mainītis faili ar 6 papildinājumiem un 13 dzēšanām
  1. 2 1
      Makefile
  2. 4 12
      templates/Makefile.config.template

+ 2 - 1
Makefile

@@ -175,7 +175,7 @@ endif
 # if you add an implicit rule however.
 
 allbin:$(ALL_BINARIES)
-	$(VERBOSE2)find ./core/ -name moc*.cpp -delete
+	
 
 alllib:$(ALL_LIBRARIES)
 
@@ -190,6 +190,7 @@ clean:
 	$(VERBOSE2)rm -f $(ALL_OBJS) $(ALL_OBJS:%.o=%.d)
 	$(VERBOSE2)rm -f $(ALL_BINARIES) $(ALL_BINARIES:%=%.bd)
 	$(VERBOSE2)rm -f $(ALL_LIBRARIES) $(ALL_CHECKS)
+	$(VERBOSE2)find ./core/ -name moc*.cpp -delete
 
 #TODO: does not remove moc_*.C (created with QT-moc from .h files)
 #alternative solution is to just rm -rf BUILD

+ 4 - 12
templates/Makefile.config.template

@@ -16,16 +16,10 @@ LIBEXISTS=$(shell g++ $(2) -x c++ -c libtests/$(1) -o /dev/null >/dev/null 2>&1
 # determine platform (32 or 64bit)
 PLATFORM:=$(shell uname -m)
 
-ifeq (x86_64,$(PLATFORM))
-  ifeq (1,$(shell test -f $(HOME)/DBVFAIL && echo "1"))
-    THIRD_BASE=nothirdbase
-    $(call CONFIGINFO,DBVEXT,0)
-  else
-    THIRD_BASE=/home/dbv/3rdparty64-gcc43
-    $(call CONFIGINFO,DBVEXT,1)
-  endif
+# THIRD_BASE=/home/dbv/3rdparty64-gcc43
 
-  ifeq (1,$(shell test -d $(THIRD_BASE) && echo "1"))
+ifeq (x86_64,$(PLATFORM))
+  ifdef THIRD_BASE
     # ICE
    ifndef ICEDIR
     ICEDIR=$(THIRD_BASE)/ice-for-limun/
@@ -62,9 +56,7 @@ ifeq (x86_64,$(PLATFORM))
   endif
 
 else
-  THIRD_BASE=/home/dbv/3rdparty32
-  
-  ifeq (1,$(shell test -d $(THIRD_BASE) && echo "1"))
+  ifdef THIRD_BASE
     # ICE
     ICEDIR=$(THIRD_BASE)/ice-for-limun/
     ICE_CFLAGS=-I$(ICEDIR)/src -DNICE_USELIB_ICE -DDONT_USE_ICE_NAMESPACE_BY_DEFAULT