Changeset 2:b8c3435b818d in xplcommon for src

Timestamp:

12/27/12 12:36:41 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Using less ambiguous conditionals to decide between POSIX vs. Windows compilation

Location:

src/xplcommon

Files:

• Makefile.am (modified) (1 diff)
• config.h.in (modified) (3 diffs)

src/xplcommon/Makefile.am

@@ -1 +1 @@
 lib_LTLIBRARIES=libxplcommon.la
 
-libxplcommon_la_SOURCES=\
+libxplcommon_la_SOURCES=
+
+if TARGET_API_POSIX
+libxplcommon_la_SOURCES +=      \
         POSIXThread.cc          \
-        Win32Thread.cc          \
         POSIXWaitable.cc        \
         POSIXWaiter.cc
+endif
+
+if TARGET_API_WIN32
+libxplcommon_la_SOURCES +=      \
+        Win32Thread.cc
+endif
 
 include_xplcommondir=$(includedir)/xplcommon

src/xplcommon/config.h.in

@@ -9 +9 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <poll.h> header file. */
-#undef HAVE_POLL_H
-
-/* Define to 1 if you have the <pthread.h> header file. */
-#undef HAVE_PTHREAD_H
 
 /* Define to 1 if you have the <stdint.h> header file. */
@@ -39 +33 @@
 /* Define to 1 if you have the <windows.h> header file. */
 #undef HAVE_WINDOWS_H
+
+/* Define to 1 if you have the <winsock2.h> header file. */
+#undef HAVE_WINSOCK2_H
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
@@ -68 +65 @@
 #undef STDC_HEADERS
 
+/* Define if the target is the POSIX API. */
+#undef TARGET_API_POSIX
+
+/* Define if the target is the Win32 API. */
+#undef TARGET_API_WIN32
+
 /* Version number of package */
 #undef VERSION