[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-3/kdebluetooth/libqobex/qobex
From:       Mathias Fröhlich <Mathias.Froehlich () web ! de>
Date:       2004-06-22 10:29:41
Message-ID: 20040622102941.3DB9824EF () office ! kde ! org
[Download RAW message or body]

CVS commit by froehlich: 

Use an other way of conditional compilation with automake. Hopefuly works now.


  M +10 -22    Makefile.am   1.7


--- kdeextragear-3/kdebluetooth/libqobex/qobex/Makefile.am  #1.6:1.7
@@ -26,20 +26,4 @@
 QOBEX_VERSION = 0:9:0
 
-if QOBEX_BTTRANSPORT
-BTTRANSPORT_OBJ = qobexbttransport.lo
-BTTRANSPORT_HDR = qobexbttransport.h
-else
-BTTRANSPORT_OBJ =
-BTTRANSPORT_HDR =
-endif
-
-if QOBEX_IRDATRANSPORT
-IRDATRANSPORT_OBJ = qobexirdatransport.lo
-IRDATRANSPORT_HDR = qobexirdatransport.h
-else
-IRDATRANSPORT_OBJ =
-IRDATRANSPORT_HDR =
-endif
-
 qobexincludedir = $(includedir)/qobex
 qobexinclude_HEADERS = \
@@ -53,7 +37,5 @@
   qobexericssontransport.h \
   qobexserialtransport.h \
-  qobexintransport.h \
-  $(BTTRANSPORT_HDR) \
-  $(IRDATRANSPORT_HDR)
+  qobexintransport.h
 
 libqobex_la_SOURCES = \
@@ -68,7 +50,13 @@
   qobexserialtransport.cpp \
   qobexintransport.cpp
-EXTRA_libqobex_la_SOURCES = \
-  qobexirdatransport.cpp \
-  qobexbttransport.cpp
+
+if QOBEX_BTTRANSPORT
+qobexinclude_HEADERS += qobexbttransport.h
+libqobex_la_SOURCES += qobexbttransport.cpp
+endif
+if QOBEX_IRDATRANSPORT
+qobexinclude_HEADERS += qobexirdatransport.h
+libqobex_la_SOURCES += qobexirdatransport.cpp
+endif
 
 libqobex_la_LIBADD = $(BTTRANSPORT_OBJ) $(IRDATRANSPORT_OBJ) $(KDE_RPATH) \


[prev in list] [next in list] [prev in thread] [next in thread]