← Back to branch summary

~ubuntu-branches/ubuntu/vivid/fbreader/vivid-proposed

« back to all changes in this revision

Viewing changes to makefiles/config.mk

  • Committer: Bazaar Package Importer
  • Author(s): Eugene V. Lyubimkin
  • Date: 2008-06-17 23:01:53 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20080617230153-a16c45tq69j8geru
Tags: 0.8.17-11
* debian/control:
  - Enhanced all ZLibrary descriptions, not the main one.
  - Done some renaming to use canonical names of libraries and toolkits in
    decriptions, as suggested by developers-reference:
    'qt' -> 'Qt', 'gtk' -> 'GTK+', 'zlibrary' -> 'ZLibrary'.
  - Bump 'Depends' on quilt to (>= 0.24).
* debian/rules:
  - Included quilt makefile instead of quilt makefile instead
    of copy&paste'ing it.
* debian/fbreader.links:
  - Added this file to relay on dh_link's work instead of using 'ln -sf'
    directly in the debian/rules.

Show diffs side-by-side

added added

removed removed

Lines of Context:
makefiles/config.mk
19
19
 
20
20
ifeq "$(TARGET_STATUS)" "release"
21
21
        CFLAGS += -O3
22
 
#       LDFLAGS += -s # dh_strip will strip it in Debian --JEH
 
22
        LDFLAGS += -s
23
23
endif
24
24
ifeq "$(TARGET_STATUS)" "debug"
25
25
        CFLAGS += -O0 -g
34
34
 
35
35
ifeq "$(ZLSHARED)" "yes"
36
36
  CORE_LIBS = -lm -L$(ROOTDIR)/zlibrary/core -lzlcore $(XML_LIB) $(ARCHIVER_LIB) -ldl
 
37
        TEXT_LIBS = -lzltext
37
38
else
38
39
  CORE_LIBS = -lm -L$(ROOTDIR)/zlibrary/ui -L$(ROOTDIR)/zlibrary/core -lzlcore -lzlui-$(UI_TYPE) -lzlcore $(UILIBS) $(XML_LIB) $(ARCHIVER_LIB)
 
40
        TEXT_LIBS = -lzltext -llinebreak
39
41
endif
40
42
 
41
43
ifneq "$(BUILD_RESOURCE_OBJECT)" "yes"