regenerated makefiles

[wxWidgets.git] / build / bakefiles / jpeg.bkl

diff --git a/build/bakefiles/jpeg.bkl b/build/bakefiles/jpeg.bkl
index dbd52bd39effa1002e1ed83de0f13493a26ac52f..a53a935229d8bba0ed0b5e954d41e57ce1adf51d 100644 (file)
--- a/build/bakefiles/jpeg.bkl
+++ b/build/bakefiles/jpeg.bkl
@@ -8,11 +8,16 @@
         <set var="wxUSE_LIBJPEG">builtin</set>
     </if>
     <set var="LIB_JPEG">
         <set var="wxUSE_LIBJPEG">builtin</set>
     </if>
     <set var="LIB_JPEG">

-        <if cond="wxUSE_LIBJPEG=='builtin'">wxjpeg</if>
+        <if cond="wxUSE_LIBJPEG=='builtin'">wxjpeg$(WXDEBUGFLAG)</if>
+    </set>
+    <set var="INC_JPEG">
+        <if cond="wxUSE_LIBJPEG=='builtin'">$(TOP_SRCDIR)src/jpeg</if>

     </set>
 
     </set>
 

-    <lib id="wxjpeg" cond="wxUSE_LIBJPEG=='builtin' and BUILDING_LIB=='1'">
+    <lib id="wxjpeg" template="3rdparty_lib"
+         cond="wxUSE_LIBJPEG=='builtin' and BUILDING_LIB=='1'">

         <dirname>$(LIBDIRNAME)</dirname>
         <dirname>$(LIBDIRNAME)</dirname>

+        <include cond="FORMAT!='autoconf'">$(LIBDIRNAME)</include>

         <sources>
             src/jpeg/jcomapi.c
                    src/jpeg/jutils.c
         <sources>
             src/jpeg/jcomapi.c
                    src/jpeg/jutils.c