From 65f404c85f4f7028401181277313b9589ed810cf Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 26 Jul 2008 18:36:48 +0000 Subject: Revert to previous dependency checking behavior. Take included header files into account when generating dependency files. This has problems when header files are removed or renamed, but does not silently miscompile files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27351 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 45dd590c47..9987b9fb6b 100644 --- a/Makefile +++ b/Makefile @@ -774,7 +774,6 @@ version.h: ./version.sh `$(CC) -dumpversion` %(EXESUF): %.c -%.o: %.d -- cgit v1.2.3 From 3a313f4def29435ce6cf16e1af7301325791d6af Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 28 Jul 2008 16:57:22 +0000 Subject: Move CFLAGS specific to internal libdvdread and libfaad2 to the Makefile and use them only when compiling objects from those subdirectories. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27359 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9987b9fb6b..4aed826653 100644 --- a/Makefile +++ b/Makefile @@ -783,9 +783,9 @@ codec-cfg.d: codecs.conf.h mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d stream/network.d stream/stream_cddb.d osdep/mplayer-rc.o: version.h $(DEPS): help_mp.h -dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE $(LIBDVDCSS_DVDREAD_FLAGS) +dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(LIBDVDCSS_DVDREAD_FLAGS) libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" -libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE +libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H loader/% loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAG_NO_OMIT_LEAF_FRAME_POINTER) #loader/%.o loader/%.d: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT -- cgit v1.2.3 From 771cd67118f4d8e1bd053c97cbb4c98b08c7b609 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 30 Jul 2008 10:26:23 +0000 Subject: Use conditional compilation instead of an #ifdef around the whole file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27371 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 4aed826653..14f0135405 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,6 @@ SRCS_COMMON = asxparser.c \ libmpcodecs/ad_alaw.c \ libmpcodecs/ad_dk3adpcm.c \ libmpcodecs/ad_dvdpcm.c \ - libmpcodecs/ad_hwac3.c \ libmpcodecs/ad_hwmpa.c \ libmpcodecs/ad_imaadpcm.c \ libmpcodecs/ad_msadpcm.c \ @@ -256,7 +255,8 @@ SRCS_COMMON-$(HAVE_SYS_MMAN_H) += osdep/mmap_anon.c SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c SRCS_COMMON-$(JPEG) += libmpcodecs/vd_ijpg.c SRCS_COMMON-$(LADSPA) += libaf/af_ladspa.c -SRCS_COMMON-$(LIBA52) += libmpcodecs/ad_liba52.c \ +SRCS_COMMON-$(LIBA52) += libmpcodecs/ad_hwac3.c \ + libmpcodecs/ad_liba52.c \ liba52/crc.c \ liba52/resample.c \ liba52/bit_allocate.c \ -- cgit v1.2.3