|
432
|
1 |
diff -ru cheese-0.2.3.orig/src/Makefile cheese-0.2.3/src/Makefile
|
|
|
2 |
--- cheese-0.2.3.orig/src/Makefile 2007年 8月 30日 四 18:28:49
|
|
|
3 |
+++ cheese-0.2.3/src/Makefile 2007年 8月 30日 四 18:51:05
|
|
|
4 |
@@ -44,8 +44,8 @@
|
|
|
5 |
LIBEBOOK_CFLAGS := $(LIBEBOK_1_2_CFLAGS)
|
|
|
6 |
LIBEBOOK_LIBS := $(LIBEBOK_1_2_LIBS)
|
|
|
7 |
|
|
|
8 |
-CFLAGS := $(call toc2.call.remove-dupes,-g -O2 -Wall -Werror $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLADE_CFLAGS) $(GSTREAMER_CFLAGS) $(GNOME_VFS_CFLAGS) $(GDK_CFLAGS) $(LIBGNOMEUI_CFLAGS) $(LIBEBOOK_CFLAGS) $(XF86VM_CFLAGS))
|
|
|
9 |
-LDFLAGS := $(call toc2.call.remove-dupes,-lpthread $(DBUS_LIBS) $(GTK_LIBS) $(GLADE_LIBS) $(GSTREAMER_LIBS) $(GNOME_VFS_LIBS) $(GDK_LIBS) $(LIBGNOMEUI_LIBS) $(LIBEBOOK_LIBS) $(XF86VM_LIBS))
|
|
|
10 |
+CFLAGS := $(call toc2.call.remove-dupes,$(CFLAGS) $(_CFLAGS))
|
|
|
11 |
+LDFLAGS := $(call toc2.call.remove-dupes,$(LDFLAGS) $(_LIBS))
|
|
|
12 |
|
|
|
13 |
OBJS = $(SOURCES:%.c=%.o)
|
|
|
14 |
|
|
|
15 |
diff -ru cheese-0.2.3.orig/toc2/make/toc2-c.make cheese-0.2.3/toc2/make/toc2-c.make
|
|
|
16 |
--- cheese-0.2.3.orig/toc2/make/toc2-c.make 2007年 6月 30日 六 07:17:29
|
|
|
17 |
+++ cheese-0.2.3/toc2/make/toc2-c.make 2007年 8月 30日 四 18:54:00
|
|
|
18 |
@@ -140,11 +140,7 @@
|
|
|
19 |
@test x != 'x$$($(1).BIN.SOURCES)' && {\
|
|
|
20 |
$(call toc2.bins.mkdep.rule-c,$$(@).d,$$($(1).BIN.SOURCES)); }; true
|
|
|
21 |
@$(call toc2.call.setx-unless-quiet,"CXX [$$@] ..."); \
|
|
|
22 |
- $$(CXX) -o $$@ \
|
|
|
23 |
- $$(INCLUDES) \
|
|
|
24 |
- $$(CFLAGS) \
|
|
|
25 |
- $$(CXXFLAGS) \
|
|
|
26 |
- $$(CPPFLAGS) \
|
|
|
27 |
+ $$(CC) -o $$@ \
|
|
|
28 |
$$(LDFLAGS) \
|
|
|
29 |
$$($(1).BIN.OBJECTS) $$($(1).BIN.SOURCES)
|
|
|
30 |
bins: $$($(1).BIN)
|
|
|
31 |
@@ -185,9 +181,8 @@
|
|
|
32 |
@test x = "x$$($(1).DLL.OBJECTS)$$($(1).DLL.SOURCES)" && { \
|
|
|
33 |
echo "toc2.eval.rules.c-dll: $$@: $(1).DLL.OBJECTS and/or $(1).DLL.SOURCES are/is undefined!"; exit 1; }; \
|
|
|
34 |
$(call toc2.call.setx-unless-quiet,"CXX [$$@] ..."); \
|
|
|
35 |
- $$(CXX) -o $$@ -shared -export-dynamic $$(LDFLAGS) \
|
|
|
36 |
- $$($(1).DLL.LDADD) $$($(1).DLL.OBJECTS) $$($(1).DLL.SOURCES) \
|
|
|
37 |
- $$($(1).DLL.CPPFLAGS)
|
|
|
38 |
+ $$(LD) -o $$@ -shared -export-dynamic $$(LDFLAGS) \
|
|
|
39 |
+ $$($(1).DLL.LDADD) $$($(1).DLL.OBJECTS) $$($(1).DLL.SOURCES)
|
|
|
40 |
endef
|
|
|
41 |
########################################################################
|
|
|
42 |
# $(call toc2.call.rules.c-dll,basename_list) calls and $(eval)s
|