diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | pixman-1.pc.in | 4 | ||||
| -rw-r--r-- | pixman/Makefile.am | 32 |
3 files changed, 18 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index 6a139b5..08b56f5 100644 --- a/configure.ac +++ b/configure.ac @@ -799,8 +799,6 @@ AM_CONDITIONAL(HAVE_GTK, [test "x$enable_gtk" = xyes]) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) dnl ===================================== dnl posix_memalign, sigaction, alarm, gettimeofday diff --git a/pixman-1.pc.in b/pixman-1.pc.in index 936d95d..e3b9711 100644 --- a/pixman-1.pc.in +++ b/pixman-1.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: Pixman Description: The pixman library (version 1) Version: @PACKAGE_VERSION@ -Cflags: -I${includedir}/pixman-1 @DEP_CFLAGS@ -Libs: -L${libdir} -lpixman-1 @DEP_LIBS@ +Cflags: -I${includedir}/pixman-1 +Libs: -L${libdir} -lpixman-1 diff --git a/pixman/Makefile.am b/pixman/Makefile.am index 18e1e04..4131ba9 100644 --- a/pixman/Makefile.am +++ b/pixman/Makefile.am @@ -6,7 +6,7 @@ AM_LDFLAGS = $(SIMPLEOPS_LIBS) lib_LTLIBRARIES = libpixman-1.la libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined -libpixman_1_la_LIBADD = $(SIMPLEOPS_LIBS) @DEP_LIBS@ -lm +libpixman_1_la_LIBADD = $(SIMPLEOPS_LIBS) -lm libpixman_1_la_SOURCES = $(libpixman_sources) $(libpixman_headers) libpixmanincludedir = $(includedir)/pixman-1 @@ -29,8 +29,8 @@ if USE_X86_MMX noinst_LTLIBRARIES += libpixman-mmx.la libpixman_mmx_la_SOURCES = \ pixman-mmx.c -libpixman_mmx_la_CFLAGS = $(AM_CFLAGS) $(DEP_CFLAGS) $(MMX_CFLAGS) -libpixman_mmx_la_LIBADD = $(SIMPLEOPS_LIBS) $(DEP_LIBS) +libpixman_mmx_la_CFLAGS = $(AM_CFLAGS) $(MMX_CFLAGS) +libpixman_mmx_la_LIBADD = $(SIMPLEOPS_LIBS) libpixman_1_la_LDFLAGS += $(MMX_LDFLAGS) libpixman_1_la_LIBADD += libpixman-mmx.la @@ -43,8 +43,8 @@ noinst_LTLIBRARIES += libpixman-vmx.la libpixman_vmx_la_SOURCES = \ pixman-vmx.c \ pixman-combine32.h -libpixman_vmx_la_CFLAGS = $(AM_CFLAGS) $(DEP_CFLAGS) $(VMX_CFLAGS) -libpixman_vmx_la_LIBADD = $(SIMPLEOPS_LIBS) $(DEP_LIBS) +libpixman_vmx_la_CFLAGS = $(AM_CFLAGS) $(VMX_CFLAGS) +libpixman_vmx_la_LIBADD = $(SIMPLEOPS_LIBS) libpixman_1_la_LIBADD += libpixman-vmx.la ASM_CFLAGS_vmx=$(VMX_CFLAGS) @@ -55,8 +55,8 @@ if USE_SSE2 noinst_LTLIBRARIES += libpixman-sse2.la libpixman_sse2_la_SOURCES = \ pixman-sse2.c -libpixman_sse2_la_CFLAGS = $(AM_CFLAGS) $(DEP_CFLAGS) $(SSE2_CFLAGS) -libpixman_sse2_la_LIBADD = $(SIMPLEOPS_LIBS) $(DEP_LIBS) +libpixman_sse2_la_CFLAGS = $(AM_CFLAGS) $(SSE2_CFLAGS) +libpixman_sse2_la_LIBADD = $(SIMPLEOPS_LIBS) libpixman_1_la_LDFLAGS += $(SSE2_LDFLAGS) libpixman_1_la_LIBADD += libpixman-sse2.la @@ -70,8 +70,8 @@ libpixman_arm_simd_la_SOURCES = \ pixman-arm-simd.c \ pixman-arm-common.h \ pixman-arm-simd-asm.S -libpixman_arm_simd_la_CFLAGS = $(AM_CFLAGS) $(DEP_CFLAGS) -libpixman_arm_simd_la_LIBADD = $(SIMPLEOPS_LIBS) $(DEP_LIBS) +libpixman_arm_simd_la_CFLAGS = $(AM_CFLAGS) +libpixman_arm_simd_la_LIBADD = $(SIMPLEOPS_LIBS) libpixman_1_la_LIBADD += libpixman-arm-simd.la ASM_CFLAGS_arm_simd= @@ -86,8 +86,8 @@ libpixman_arm_neon_la_SOURCES = \ pixman-arm-neon-asm.S \ pixman-arm-neon-asm-bilinear.S \ pixman-arm-neon-asm.h -libpixman_arm_neon_la_CFLAGS = $(AM_CFLAGS) $(DEP_CFLAGS) -libpixman_arm_neon_la_LIBADD = $(SIMPLEOPS_LIBS) $(DEP_LIBS) +libpixman_arm_neon_la_CFLAGS = $(AM_CFLAGS) +libpixman_arm_neon_la_LIBADD = $(SIMPLEOPS_LIBS) libpixman_1_la_LIBADD += libpixman-arm-neon.la ASM_CFLAGS_arm_neon= @@ -108,7 +108,7 @@ libpixman_iwmmxt_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(CFLAGS) $(IWMMXT_CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -libpixman_iwmmxt_la_LIBADD = $(SIMPLEOPS_LIBS) $(DEP_LIBS) +libpixman_iwmmxt_la_LIBADD = $(SIMPLEOPS_LIBS) libpixman-iwmmxt.la: libpixman_iwmmxt_la-pixman-mmx.lo $(libpixman_iwmmxt_la_DEPENDENCIES) $(AM_V_CCLD)$(libpixman_iwmmxt_la_LINK) libpixman_iwmmxt_la-pixman-mmx.lo $(libpixman_iwmmxt_la_LIBADD) $(LIBS) @@ -123,8 +123,8 @@ libpixman_mips_dspr2_la_SOURCES = \ pixman-mips-dspr2-asm.S \ pixman-mips-dspr2-asm.h \ pixman-mips-memcpy-asm.S -libpixman_mips_dspr2_la_CFLAGS = $(AM_CFLAGS) $(DEP_CFLAGS) -libpixman_mips_dspr2_la_LIBADD = $(SIMPLEOPS_LIBS) $(DEP_LIBS) +libpixman_mips_dspr2_la_CFLAGS = $(AM_CFLAGS) +libpixman_mips_dspr2_la_LIBADD = $(SIMPLEOPS_LIBS) libpixman_1_la_LIBADD += libpixman-mips-dspr2.la ASM_CFLAGS_mips_dspr2= @@ -134,8 +134,8 @@ endif if USE_LOONGSON_MMI noinst_LTLIBRARIES += libpixman-loongson-mmi.la libpixman_loongson_mmi_la_SOURCES = pixman-mmx.c loongson-mmintrin.h -libpixman_loongson_mmi_la_CFLAGS = $(AM_CFLAGS) $(DEP_CFLAGS) $(LS_CFLAGS) -libpixman_loongson_mmi_la_LIBADD = $(SIMPLEOPS_LIBS) $(DEP_LIBS) +libpixman_loongson_mmi_la_CFLAGS = $(AM_CFLAGS) $(LS_CFLAGS) +libpixman_loongson_mmi_la_LIBADD = $(SIMPLEOPS_LIBS) libpixman_1_la_LDFLAGS += $(LS_LDFLAGS) libpixman_1_la_LIBADD += libpixman-loongson-mmi.la |